Prepare function signature (still OK)

This commit is contained in:
Kermalis
2023-08-03 09:06:01 -04:00
parent 9d5fd0e7f0
commit fadeddf985
2 changed files with 13 additions and 11 deletions

View File

@@ -8,7 +8,7 @@ struct UnkTextStruct1
s16 unk2;
s16 unk4;
s16 unk6;
u16 unk8;
s16 unk8;
u32 unkC;
u32 unk10;
u32 unk14;
@@ -29,8 +29,9 @@ struct UnkTextStruct1
// size: 0x4
struct UnkTextStruct2_sub
{
u16 unk0;
u16 unk2;
//s16 unk0[2]; // TODO: Try union and see if it fixes kecleon
s16 unk0;
s16 unk4;
};
// size: 0x18
@@ -50,12 +51,13 @@ struct UnkTextStruct2
void LoadCharmaps(void);
void SelectCharmap(u32);
u32 xxx_update_some_bg_tiles(u32 a0);
void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, u32 *a3);
void sub_8006554(void *a0, void *a1, void *a2, void *a3, u32 a4, const struct UnkTextStruct2 *a5, u8 a6, u32 a7, u32 *a8, u32 a9);
void sub_800898C(void);
void sub_80089AC(const struct UnkTextStruct2 *a0, void *a1);
void sub_8009388(void);
void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2);
void sub_8006438(const struct UnkTextStruct2 *, u8, u8, struct UnkTextStruct2_sub *);
void sub_8006518(struct UnkTextStruct2 *);
void sub_8006554(struct UnkTextStruct1 *, void *, u8 *, u16 *, u32, const struct UnkTextStruct2 *, u8, u32, struct UnkTextStruct2_sub *, u8);
void sub_800898C(void);
void sub_80089AC(const struct UnkTextStruct2 *, struct UnkTextStruct2_sub *);
void sub_8009388(void);
extern void xxx_call_draw_string(s32 x, u32 y, const u8 *str, u32 , u32);
#endif

View File

@@ -138,11 +138,11 @@ void sub_80063D8(int a0)
void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2)
{
u32 r3 = 0;
struct UnkTextStruct2_sub r3 = {0, 0};
sub_8006438(a0, a1, a2, &r3);
}
void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, u32 *a3)
void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, struct UnkTextStruct2_sub *a3)
{
int i;
u32 r9 = 2;
@@ -158,7 +158,7 @@ void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, u32 *a3)
gUnknown_202AFC0[i] = a0[i];
if (a0[i].unkC) {
sub_8006554(gUnknown_2027370, (void *)VRAM, gUnknown_20274B4, gUnknown_202B038, gUnknown_80B8804[i], a0 + i, a1, r9, a3, 0);
sub_8006554(gUnknown_2027370, (void *)VRAM, gUnknown_20274B4, &gUnknown_202B038[0][0][0], gUnknown_80B8804[i], a0 + i, a1, r9, a3, 0);
sub_80089AC(a0 + i, a3);
r9 += a0[i].unkC * a0[i].unk10;
}