summaryrefslogtreecommitdiff
path: root/src/load_screen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/load_screen.c')
-rw-r--r--src/load_screen.c71
1 files changed, 33 insertions, 38 deletions
diff --git a/src/load_screen.c b/src/load_screen.c
index 2b40564..6271dbc 100644
--- a/src/load_screen.c
+++ b/src/load_screen.c
@@ -4,6 +4,7 @@
#include "play_time.h"
#include "file_system.h"
#include "memory.h"
+#include "text.h"
extern struct PlayTimeStruct *gPlayTimeRef;
extern struct PlayTimeStruct gPlayTime;
@@ -19,16 +20,11 @@ struct unkStruct_808D33C
struct unkStruct_203B484
{
u8 fill0[0xC];
- s16 unkC;
+ s16 speciesIndex;
u8 fillE[0x50 - 0xE];
u32 unk50;
};
-struct unkData
-{
- u8 unk0[24];
-};
-
struct unkStruct_203B374
{
// size: 0x27c
@@ -39,7 +35,7 @@ struct unkStruct_203B374
u8 fill58[0xA4 - 0x58];
u32 unkA4;
u8 fillA8[0x144 - 0xA8];
- struct unkData unk144[4];
+ struct UnkTextStruct2 unk144[4];
/* 0x1A4 */ u8 formattedTeamName[0x24];
/* 0x1C8 */ u8 formattedPlayerName[0x24];
/* 0x1EC */ u8 formattedLocation[0x24];
@@ -54,15 +50,15 @@ extern u32 gUnknown_203B3B8[];
extern u32 gUnknown_203B388[];
extern struct unkStruct_203B484 *gUnknown_203B484;
-extern struct unkData gUnknown_80E75F8;
-extern struct unkData gUnknown_80E7610;
-extern struct unkData gUnknown_80E762C;
+extern struct UnkTextStruct2 gUnknown_80E75F8;
+extern struct UnkTextStruct2 gUnknown_80E7610;
+extern struct UnkTextStruct2 gUnknown_80E762C;
extern u32 gUnknown_80E7644;
extern u32 gUnknown_80E7684;
extern u32 gUnknown_80E76B8;
extern u32 gUnknown_80E76E8;
extern u32 gUnknown_80E7730;
-extern struct unkData gUnknown_80E7784;
+extern struct UnkTextStruct2 gUnknown_80E7784;
extern u32 gUnknown_80E779C;
extern u8 gUnknown_80E77BC;
extern u8 gUnknown_80E77C4;
@@ -85,8 +81,7 @@ extern const char gUnknown_80E785C[]; // clmkpat
u8 IsQuickSave(void);
void DrawLoadScreenText(void);
extern void sub_8035CF4(u32 *, u32, u32);
-extern void sub_800641C(struct unkData *, u32, u32);
-extern void SetMenuItems(u32 *, struct unkData *, u32, struct unkData *, u32 *, u32, u32, u32);
+extern void SetMenuItems(u32 *, struct UnkTextStruct2 *, u32, struct UnkTextStruct2 *, u32 *, u32, u32, u32);
extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, u32 *);
extern void sub_8095240(u32);
@@ -96,10 +91,10 @@ extern void sub_80920D8(u8 *);
extern struct unkStruct_808D33C *sub_808D33C(void);
extern u8 sub_80023E4(u32);
extern u8 *sub_8098FB4();
-extern void sub_800D158(u8 *buffer, u8 *text, ...);
+extern void ExpandPlaceholdersBuffer(u8 *buffer, u8 *text, ...);
extern s32 sub_8011C1C(void);
extern u8 *sub_809769C(void);
-extern u32 sub_8097778(void);
+extern u32 GetNumAdventures(void);
extern void xxx_call_draw_string(u32 x, u32 y, u8 *, u32, u32);
extern void sub_8090228(u8 *, u8 *);
extern void sub_80922B4(u8 *, u8 *, u32);
@@ -244,7 +239,7 @@ void DrawLoadScreenText(void)
else {
strcpy(teamNameBuffer,&gUnknown_80E77F8);
}
- sub_800D158(gUnknown_203B374->formattedTeamName,&gUnknown_80E7804,teamNameBuffer);
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedTeamName,&gUnknown_80E7804,teamNameBuffer);
xxx_call_draw_string(64,0,gUnknown_203B374->formattedTeamName,0,0);
// Draw Player Name
@@ -255,7 +250,7 @@ void DrawLoadScreenText(void)
else {
sub_80922B4(playerName,&playerInfo->unk4C,10);
}
- sub_800D158(gUnknown_203B374->formattedPlayerName,&gUnknown_80E7804,playerName);
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedPlayerName,&gUnknown_80E7804,playerName);
xxx_call_draw_string(64,12,gUnknown_203B374->formattedPlayerName,0,0);
// Draw Location Info
@@ -265,25 +260,25 @@ void DrawLoadScreenText(void)
sub_8090228(gUnknown_203B374->formattedLocation,sub_809769C());
}
else {
- sub_800D158(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
}
}
else {
switch(sub_8011C1C())
{
default:
- sub_800D158(gUnknown_203B374->formattedLocation,&gUnknown_80E7824); // Location unknown
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedLocation,&gUnknown_80E7824); // Location unknown
break;
case 1:
switch(sub_8001658(0,24))
{
default:
- sub_800D158(auStack356,&gUnknown_80E7804,sub_8098FB4());
+ ExpandPlaceholdersBuffer(auStack356,&gUnknown_80E7804,sub_8098FB4());
xxx_format_string(auStack356,gUnknown_203B374->formattedLocation,gUnknown_203B374->formattedPlayTime,0);
break;
case 0x7:
case 0xB:
- sub_800D158(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
break;
}
break;
@@ -292,7 +287,7 @@ void DrawLoadScreenText(void)
{
sub_8090228(gUnknown_203B374->formattedLocation,sub_809769C());
} else {
- sub_800D158(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedLocation,&gUnknown_80E780C); // Quicksave data deleted
}
break;
}
@@ -301,23 +296,23 @@ void DrawLoadScreenText(void)
// Draw Play Time
DeconstructPlayTime(gPlayTimeRef,&hours,&minutes,&seconds);
- sub_800D158(gUnknown_203B374->formattedPlayTime,&gUnknown_80E7838,hours,minutes,seconds);
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedPlayTime,&gUnknown_80E7838,hours,minutes,seconds);
xxx_call_draw_string(64,36,gUnknown_203B374->formattedPlayTime,0,0);
// Draw Adventures Info
- numAdventures = sub_8097778();
- sub_800D158(gUnknown_203B374->formattedAdventures,&gUnknown_80E7848,numAdventures); // %d
+ numAdventures = GetNumAdventures();
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedAdventures,&gUnknown_80E7848,numAdventures); // %d
xxx_call_draw_string(64,48,gUnknown_203B374->formattedAdventures,0,0);
// Draw Helper Info
- if ((iVar2 == 0xf1207) && (gUnknown_203B484->unkC != 0)) {
- sub_808D930(speciesHelper,gUnknown_203B484->unkC);
+ if ((iVar2 == 0xf1207) && (gUnknown_203B484->speciesIndex != 0)) {
+ sub_808D930(speciesHelper,gUnknown_203B484->speciesIndex);
// TODO very hacky match here
sub_80922B4(nameHelper,(u8 *)(&gUnknown_203B484 + 0x14),10);
- sub_800D158(gUnknown_203B374->formattedHelperInfo,&gUnknown_80E784C,nameHelper,speciesHelper); // %s (%s)
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedHelperInfo,&gUnknown_80E784C,nameHelper,speciesHelper); // %s (%s)
}
else {
- sub_800D158(gUnknown_203B374->formattedHelperInfo,&gUnknown_80E7854); // -----
+ ExpandPlaceholdersBuffer(gUnknown_203B374->formattedHelperInfo,&gUnknown_80E7854); // -----
}
xxx_call_draw_string(64,60,gUnknown_203B374->formattedHelperInfo,0,0);
@@ -404,7 +399,7 @@ void DrawLoadScreenText(void)
"\tlsls r4, 1\n"
"\tadds r0, r4\n"
"\tldr r1, _08039590\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tldr r2, [r5]\n"
"\tadds r2, r4\n"
"\tmovs r0, 0\n"
@@ -443,7 +438,7 @@ void DrawLoadScreenText(void)
"\tadds r0, r4\n"
"\tldr r6, _080395F4\n"
"\tadds r1, r6, 0\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tldr r2, [r5]\n"
"\tadds r2, r4\n"
"\tmovs r0, 0\n"
@@ -505,7 +500,7 @@ void DrawLoadScreenText(void)
"\tadds r2, r0, 0\n"
"\tadd r0, sp, 0x4\n"
"\tadds r1, r6, 0\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tldr r0, [r5]\n"
"\tmovs r3, 0xF6\n"
"\tlsls r3, 1\n"
@@ -549,7 +544,7 @@ void DrawLoadScreenText(void)
"_08039690:\n"
"\tldr r1, _0803974C\n"
"_08039692:\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"_08039696:\n"
"\tldr r7, _08039750\n"
"\tldr r2, [r7]\n"
@@ -580,7 +575,7 @@ void DrawLoadScreenText(void)
"\tadd r4, sp, 0x14C\n"
"\tldr r4, [r4]\n"
"\tstr r4, [sp]\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tldr r2, [r7]\n"
"\tadds r2, r5\n"
"\tstr r6, [sp]\n"
@@ -588,14 +583,14 @@ void DrawLoadScreenText(void)
"\tmovs r1, 0x24\n"
"\tmovs r3, 0\n"
"\tbl xxx_call_draw_string\n"
- "\tbl sub_8097778\n"
+ "\tbl GetNumAdventures\n"
"\tadds r2, r0, 0\n"
"\tldr r0, [r7]\n"
"\tmovs r4, 0x8D\n"
"\tlsls r4, 2\n"
"\tadds r0, r4\n"
"\tldr r1, _0803975C\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tldr r2, [r7]\n"
"\tadds r2, r4\n"
"\tstr r6, [sp]\n"
@@ -629,7 +624,7 @@ void DrawLoadScreenText(void)
"\tldr r1, _08039768\n"
"\tadds r2, r4, 0\n"
"\tadds r3, r5, 0\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"\tb _0803977C\n"
"\t.align 2, 0\n"
"_0803974C: .4byte gUnknown_80E780C\n"
@@ -647,7 +642,7 @@ void DrawLoadScreenText(void)
"\tlsls r1, 2\n"
"\tadds r0, r1\n"
"\tldr r1, _080397B0\n"
- "\tbl sub_800D158\n"
+ "\tbl ExpandPlaceholdersBuffer\n"
"_0803977C:\n"
"\tldr r0, _080397AC\n"
"\tldr r2, [r0]\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 04:07:35 +0000