mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-26 21:34:47 -04:00
decompile more of code_2 and move some data
This commit is contained in:
+37
-11
@@ -83,7 +83,7 @@ struct SubStruct_203B198
|
||||
u16 unkC; // x3C
|
||||
u16 unkE; // x3E
|
||||
u16 unk10; // x40
|
||||
u8 fill12[0x48-0x42]; // x42
|
||||
u8 fill12[6]; // x42
|
||||
};
|
||||
|
||||
struct UnkStruct_203B198
|
||||
@@ -104,16 +104,42 @@ extern struct UnkStruct_203B198 gUnknown_203B198;
|
||||
extern UnkTextStruct1 gUnknown_2027370[4];
|
||||
extern void (*gUnknown_203B088)(s32 a0);
|
||||
|
||||
extern const struct SubStruct_203B198 gUnknown_80D48AC;
|
||||
extern const struct UnkTextStruct2 gUnknown_80D48DC;
|
||||
extern const struct UnkTextStruct2 gUnknown_80D48C4;
|
||||
extern const u32 gUnknown_80D48A0[];
|
||||
extern const u8 gUnknown_80D48F8[];
|
||||
extern const u8 gUnknown_80D4900[];
|
||||
extern const u8 gUnknown_80D4904[];
|
||||
static const u32 gUnknown_80D48A0[] = {0x7, 0x2, 0x2};
|
||||
static const struct SubStruct_203B198 gUnknown_80D48AC = {
|
||||
0x00,
|
||||
0x03,
|
||||
0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00
|
||||
|
||||
};
|
||||
|
||||
static const UnkTextStruct2 gUnknown_80D48C4 = {
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x00,
|
||||
0x02, 0x0F,
|
||||
0x1A, 0x05,
|
||||
0x07, 0x00,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const UnkTextStruct2 gUnknown_80D48DC = {
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x02,
|
||||
0x02, 0x08,
|
||||
0x1A, 0x05,
|
||||
0x07, 0x00,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
ALIGNED(4) static const u8 sSpeakerNameSeparator[] = ": ";
|
||||
ALIGNED(4) static const u8 sUnknownTeamName[] = "????";
|
||||
ALIGNED(4) static const u8 gUnknown_80D4900[] = "%d";
|
||||
ALIGNED(4) static const u8 gUnknown_80D4904[] = "%*d" ;
|
||||
extern const u8 gUnknown_80D4908[];
|
||||
extern const u8 gUnknown_80D4910[];
|
||||
extern const u8 gSpeakerNameSeparator[];
|
||||
|
||||
extern void SetCharacterMask(int a0);
|
||||
extern void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2);
|
||||
@@ -705,7 +731,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
|
||||
r9 = FALSE;
|
||||
if (flags & 8) {
|
||||
AppendString(gSpeakerNameBuffer, &dst, dstMax, flags);
|
||||
AppendString(gSpeakerNameSeparator, &dst, dstMax, flags);
|
||||
AppendString(sSpeakerNameSeparator, &dst, dstMax, flags);
|
||||
}
|
||||
}
|
||||
else if (r9) {
|
||||
@@ -759,7 +785,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
|
||||
sub_80920D8(sFormatBuffer_TeamName);
|
||||
}
|
||||
else {
|
||||
strcpy(sFormatBuffer_TeamName, gUnknown_80D48F8); // ????
|
||||
strcpy(sFormatBuffer_TeamName, sUnknownTeamName); // ????
|
||||
}
|
||||
txtPtr = sFormatBuffer_TeamName;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user