pret/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-02 15:30:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326 from DizzyEggg/code_8066D04

Browse Source 
code_8066D04.s + UnkTextStruct2 cleanup
This commit is contained in:
AnonymousRandomPerson
2025-02-20 20:32:39 -05:00
committed by GitHub
parent 40f3e74f15 f9242c4ef6
commit 7f6f52acc8
152 changed files with 2041 additions and 3660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/adventure_log.c
+6 -6
View File
@@ -23,13 +23,13 @@ bool8 CreateAdventureLogScreen(u32 kind)
{
sAdventureLog = MemoryAlloc(sizeof(*sAdventureLog), 8);
sAdventureLog->s0.unk34 = kind;
sAdventureLog->s0.unk38 = &sAdventureLog->s0.unk3C[kind];
RestoreUnkTextStruct_8006518(sAdventureLog->s0.unk3C);
sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E2008;
sAdventureLog->s0.unk38 = &sAdventureLog->s0.unk3C.a0[kind];
RestoreUnkTextStruct_8006518(&sAdventureLog->s0.unk3C);
sAdventureLog->s0.unk3C.a0[sAdventureLog->s0.unk34] = sUnknown_80E2008;
sAdventureLog->s0.unk38->unk14 = &sAdventureLog->unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sAdventureLog->s0.unk3C, TRUE, TRUE);
sub_8013818(&sAdventureLog->s0.input, 0x20, 8, kind);
sub_8032084();
DisplayAdventureLog();
@@ -63,9 +63,9 @@ u32 HandleAdventureLogInput(bool8 a0)
void CleanAdventureLogScreen(void)
{
if (sAdventureLog != NULL) {
sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E1FF0;
sAdventureLog->s0.unk3C.a0[sAdventureLog->s0.unk34] = sUnknown_80E1FF0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sAdventureLog->s0.unk3C, TRUE, TRUE);
MemoryFree(sAdventureLog);
sAdventureLog = NULL;
}
src/code_8010EF0.c
+2 -2
View File
@@ -7,14 +7,14 @@ EWRAM_INIT void *gUnknown_203B0E8 = NULL; // Pointer to some unknown struct
EWRAM_INIT UnkTextStruct2 gUnknown_203B0EC[4] = { // Exact location of this variable is unknown. Find a better place for it once more code is decompiled.
[0] = {
.unk4 = 3,
.unk8 = {2, 10},
.pos = {2, 10},
.unkC = 26,
.unkE = 9,
.unk10 = 9,
},
[1] = {
.unk4 = 3,
.unk8 = {23, 6},
.pos = {23, 6},
.unkC = 5,
.unkE = 3,
.unk10 = 3,
src/code_8015080.c
+12 -12
View File
@@ -16,7 +16,7 @@ struct unkStruct_203B1F8
// size: 0x4B4
u32 menuAction;
MenuStruct unk4;
UnkTextStruct2 unk54[4];
UnkTextStruct3 unk54;
u8 buffer[0x400];
};
@@ -296,14 +296,14 @@ bool8 sub_8015080(u8 *buffer, const MenuItem *menuItems)
for(index = 0; index < 4; index++)
{
gUnknown_203B1F8->unk54[index] = gUnknown_80DAF70;
gUnknown_203B1F8->unk54.a0[index] = gUnknown_80DAF70;
}
gUnknown_203B1F8->unk54[0] = gUnknown_80DAF88;
gUnknown_203B1F8->unk54[2] = gUnknown_80DAFA0;
sub_8012CAC(&gUnknown_203B1F8->unk54[2], menuItems);
gUnknown_203B1F8->unk54.a0[0] = gUnknown_80DAF88;
gUnknown_203B1F8->unk54.a0[2] = gUnknown_80DAFA0;
sub_8012CAC(&gUnknown_203B1F8->unk54.a0[2], menuItems);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B1F8->unk54, 1, 1);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B1F8->unk54, 1, 1);
sub_80073B8(0);
FormatString(buffer, gUnknown_203B1F8->buffer, gUnknown_203B1F8->buffer + 0x400, 0);
PrintStringOnWindow(4, 4, gUnknown_203B1F8->buffer, 0, 0);
@@ -356,7 +356,7 @@ struct unkStruct_203B1FC
u8 *unkF8;
u8 unkFC[56];
u8 *unk134;
UnkTextStruct2 unk138[4];
UnkTextStruct3 unk138;
};
extern struct unkStruct_203B1FC *gUnknown_203B1FC;
@@ -471,19 +471,19 @@ u32 sub_80151C0(u32 r0, u8 *buffer)
gUnknown_203B1FC->unk17 = 0;
for (index = 0; index < 4; index++) {
gUnknown_203B1FC->unk138[index] = gUnknown_80DB538;
gUnknown_203B1FC->unk138.a0[index] = gUnknown_80DB538;
}
if(gUnknown_203B1FC->unk4 != 0) {
gUnknown_203B1FC->unk138[1] = gUnknown_80DB580;
gUnknown_203B1FC->unk138.a0[1] = gUnknown_80DB580;
}
else {
gUnknown_203B1FC->unk138[1] = gUnknown_80DB568;
gUnknown_203B1FC->unk138.a0[1] = gUnknown_80DB568;
}
gUnknown_203B1FC->unk138[0] = gUnknown_80DB550;
gUnknown_203B1FC->unk138.a0[0] = gUnknown_80DB550;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B1FC->unk138, 1, 1);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B1FC->unk138, 1, 1);
sub_8015A08(1);
sub_8015C1C();
src/code_801B3C0.c
+2 -2
View File
@@ -26,9 +26,9 @@ bool8 sub_801B3C0(Item *item)
sUnknown_203B230->item = *item;
sub_801317C(&sUnknown_203B230->unk88);
sUnknown_203B230->unk24 = 0;
sub_80140B4(sUnknown_203B230->unk28);
sub_80140B4(&sUnknown_203B230->unk28);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B230->unk28, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B230->unk28, TRUE, TRUE);
sub_801B46C(0);
return TRUE;
}
src/code_801B60C.c
+10 -10
View File
@@ -124,26 +124,26 @@ static void sub_801B760(void)
case 13:
case 14:
case 15:
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
RestoreUnkTextStruct_8006518(&sUnknown_203B234->unkF4);
for (i = 0; i < 4; i++)
sUnknown_203B234->unkF4[i] = sUnknown_80DBA58;
sUnknown_203B234->unkF4.a0[i] = sUnknown_80DBA58;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 10:
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
RestoreUnkTextStruct_8006518(&sUnknown_203B234->unkF4);
sub_801BB5C();
sUnknown_203B234->unkF4[2] = sUnknown_80DBA70;
sub_8012CAC(&sUnknown_203B234->unkF4[2], sUnknown_203B234->unkCC);
sUnknown_203B234->unkF4.a0[2] = sUnknown_80DBA70;
sub_8012CAC(&sUnknown_203B234->unkF4.a0[2], sUnknown_203B234->unkCC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 12:
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
sUnknown_203B234->unkF4[1] = sUnknown_80DBA88;
RestoreUnkTextStruct_8006518(&sUnknown_203B234->unkF4);
sUnknown_203B234->unkF4.a0[1] = sUnknown_80DBA88;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B234->unkF4, TRUE, TRUE);
break;
}
}
src/code_801C8C4.c
+9 -9
View File
@@ -18,7 +18,7 @@ static EWRAM_INIT u16 sUnknown_203B24E = {0};
static void sub_801CC38(void);
static u32 sub_801CE58(void);
bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3)
bool8 sub_801C8C4(s32 a0, s32 a1, DungeonPos *a2, u32 a3)
{
if (sub_801CF14(a0))
return FALSE;
@@ -29,17 +29,17 @@ bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3)
sUnknown_203B244->unk0 = a0;
sub_801CF94();
sUnknown_203B244->unk4B4.s0.unk34 = a1;
sUnknown_203B244->unk4B4.s0.unk38 = &sUnknown_203B244->unk4B4.s0.unk3C[a1];
RestoreUnkTextStruct_8006518(sUnknown_203B244->unk4B4.s0.unk3C);
sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE54;
sUnknown_203B244->unk4B4.s0.unk38 = &sUnknown_203B244->unk4B4.s0.unk3C.a0[a1];
RestoreUnkTextStruct_8006518(&sUnknown_203B244->unk4B4.s0.unk3C);
sUnknown_203B244->unk4B4.s0.unk3C.a0[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE54;
sUnknown_203B244->unk4B4.s0.unk38->unk14 = &sUnknown_203B244->unk4B4.unk9C;
if (a2 != NULL)
sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34].unk8 = *a2;
sUnknown_203B244->unk4B4.s0.unk3C.a0[sUnknown_203B244->unk4B4.s0.unk34].pos = *a2;
sub_8012D08(sUnknown_203B244->unk4B4.s0.unk38, a3);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B244->unk4B4.s0.input, sub_801CE58(), a3, a1);
if (sUnknown_203B248 == sUnknown_203B244->unk0) {
@@ -111,7 +111,7 @@ u8 sub_801CB24(void)
void sub_801CB5C(bool8 a0)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE);
sUnknown_203B244->unk4B4.s0.input.unk22 = sub_801CE58();
sub_8013984(&sUnknown_203B244->unk4B4.s0.input);
sub_801CC38();
@@ -127,9 +127,9 @@ void sub_801CBB8(void)
sUnknown_203B248 = sUnknown_203B244->unk0;
sUnknown_203B24C = sUnknown_203B244->unk4B4.s0.input.menuIndex;
sUnknown_203B24E = sUnknown_203B244->unk4B4.s0.input.unk1E;
sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE3C;
sUnknown_203B244->unk4B4.s0.unk3C.a0[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE3C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B244);
sUnknown_203B244 = NULL;
}
src/code_801D014.c
+17 -17
View File
@@ -188,7 +188,7 @@ static void sub_801D220(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B250->unkB8);
RestoreUnkTextStruct_8006518(&sUnknown_203B250->unkB8);
switch (sUnknown_203B250->state) {
case 0:
@@ -196,18 +196,18 @@ static void sub_801D220(void)
if (sUnknown_203B250->pokeStruct != NULL) {
for (i = 0; i < 4; i++)
sUnknown_203B250->unkB8[i] = sUnknown_80DBE7C;
sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBE7C;
sUnknown_203B250->unkB8[0] = sUnknown_80DBE98;
sub_8012CAC(sUnknown_203B250->unkB8, sUnknown_203B250->unk68);
sUnknown_203B250->unkB8[0].unkC = 9;
sUnknown_203B250->unkB8.a0[0] = sUnknown_80DBE98;
sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68);
sUnknown_203B250->unkB8.a0[0].unkC = 9;
}
else {
for (i = 0; i < 4; i++)
sUnknown_203B250->unkB8[i] = sUnknown_80DBEB0[i];
sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBEB0[i];
sub_8012CAC(sUnknown_203B250->unkB8, sUnknown_203B250->unk68);
sUnknown_203B250->unkB8[0].unkC = 8;
sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68);
sUnknown_203B250->unkB8.a0[0].unkC = 8;
}
break;
case 1:
@@ -215,28 +215,28 @@ static void sub_801D220(void)
if (sUnknown_203B250->pokeStruct != NULL) {
for (i = 0; i < 4; i++)
sUnknown_203B250->unkB8[i] = sUnknown_80DBE7C;
sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBE7C;
sUnknown_203B250->unkB8[0] = sUnknown_80DBE98;
sub_8012CAC(sUnknown_203B250->unkB8, sUnknown_203B250->unk68);
sUnknown_203B250->unkB8[0].unkC = 9;
sUnknown_203B250->unkB8.a0[0] = sUnknown_80DBE98;
sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68);
sUnknown_203B250->unkB8.a0[0].unkC = 9;
}
else {
for (i = 0; i < 4; i++)
sUnknown_203B250->unkB8[i] = sUnknown_80DBEB0[i];
sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBEB0[i];
sub_8012CAC(sUnknown_203B250->unkB8, sUnknown_203B250->unk68);
sUnknown_203B250->unkB8[0].unkC = 8;
sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68);
sUnknown_203B250->unkB8.a0[0].unkC = 8;
}
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B250->unkB8[i] = sUnknown_80DBE7C;
sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBE7C;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B250->unkB8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B250->unkB8, TRUE, TRUE);
}
static void sub_801D3A8(void)
src/code_801D9E4.c
+7 -7
View File
@@ -23,12 +23,12 @@ bool8 sub_801D9E4(void)
{
sUnknown_203B258 = MemoryAlloc(sizeof(*sUnknown_203B258), 8);
sUnknown_203B258->s0.unk34 = 3;
sUnknown_203B258->s0.unk38 = &sUnknown_203B258->s0.unk3C[3];
RestoreUnkTextStruct_8006518(sUnknown_203B258->s0.unk3C);
sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF88;
sUnknown_203B258->s0.unk38 = &sUnknown_203B258->s0.unk3C.a0[3];
RestoreUnkTextStruct_8006518(&sUnknown_203B258->s0.unk3C);
sUnknown_203B258->s0.unk3C.a0[sUnknown_203B258->s0.unk34] = sUnknown_80DBF88;
sUnknown_203B258->s0.unk38->unk14 = &sUnknown_203B258->unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B258->s0.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B258->s0.input, 229, 10, sUnknown_203B258->s0.unk34);
sub_801DB54();
sub_801DBD4();
@@ -80,9 +80,9 @@ UNUSED static void sub_801DADC(bool8 a0)
void sub_801DB0C(void)
{
if (sUnknown_203B258 != NULL) {
sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF70;
sUnknown_203B258->s0.unk3C.a0[sUnknown_203B258->s0.unk34] = sUnknown_80DBF70;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B258->s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B258);
sUnknown_203B258 = NULL;
}
@@ -96,7 +96,7 @@ static void sub_801DB54(void)
sUnknown_203B258->unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B258->s0.unk3C, TRUE, TRUE);
SUB_80095E4_CALL(sUnknown_203B258->s0);
}
src/code_801EE10.c
+9 -9
View File
@@ -84,16 +84,16 @@ u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *tex
if (iVar8 < four) {
iVar8 = 4;
}
RestoreUnkTextStruct_8006518(gUnknown_203B270->unk58);
RestoreUnkTextStruct_8006518(&gUnknown_203B270->unk58);
gUnknown_203B270->unk50 = param_6;
gUnknown_203B270->unk58[param_6] = gUnknown_80DC25C;
gUnknown_203B270->unk58.a0[param_6] = gUnknown_80DC25C;
if (gUnknown_203B270->text != NULL) {
gUnknown_203B270->unk54 = sub_8006544(param_6);
gUnknown_203B270->unk58[gUnknown_203B270->unk54] = gUnknown_80DC274;
gUnknown_203B270->unk58.a0[gUnknown_203B270->unk54] = gUnknown_80DC274;
}
sub_8012D08(&gUnknown_203B270->unk58[gUnknown_203B270->unk50],iVar8);
sub_8012D08(&gUnknown_203B270->unk58.a0[gUnknown_203B270->unk50],iVar8);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B270->unk58, TRUE, TRUE);
sub_8013818(&gUnknown_203B270->input,iVar5,iVar5,param_6);
sub_8013780(&gUnknown_203B270->input,0);
sub_801F280(TRUE);
@@ -250,7 +250,7 @@ void sub_801F1B0(bool8 param_1, bool8 param_2)
if(!gUnknown_203B270->unk4)
gUnknown_203B270->unk4 = param_2;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B270->unk58, TRUE, TRUE);
gUnknown_203B270->input.unk22 = sub_801F3F8();
sub_8013984(&gUnknown_203B270->input);
gUnknown_203B270->input.menuIndex = sub_8092F4C(gUnknown_203B270->moves, gUnknown_203B270->input.menuIndex);
@@ -263,13 +263,13 @@ void sub_801F214(void)
{
if(gUnknown_203B270)
{
gUnknown_203B270->unk58[gUnknown_203B270->unk50] = gUnknown_80DC240;
gUnknown_203B270->unk58.a0[gUnknown_203B270->unk50] = gUnknown_80DC240;
if(gUnknown_203B270->text)
{
gUnknown_203B270->unk58[gUnknown_203B270->unk54] = gUnknown_80DC240;
gUnknown_203B270->unk58.a0[gUnknown_203B270->unk54] = gUnknown_80DC240;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B270->unk58, TRUE, TRUE);
MemoryFree(gUnknown_203B270);
gUnknown_203B270 = NULL;
}
src/code_801F428.c
+7 -7
View File
@@ -52,16 +52,16 @@ bool8 sub_801F428(s16 index, s32 param_2)
gUnknown_203B274->pokeStruct = &gRecruitedPokemonRef->pokemon[index_s32];
gUnknown_203B274->unk4 = &gUnknown_203B274->unk8;
gUnknown_203B274->s348.s0.unk34 = param_2;
gUnknown_203B274->s348.s0.unk38 = &gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34];
RestoreUnkTextStruct_8006518(gUnknown_203B274->s348.s0.unk3C);
gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2C4;
gUnknown_203B274->s348.s0.unk38 = &gUnknown_203B274->s348.s0.unk3C.a0[gUnknown_203B274->s348.s0.unk34];
RestoreUnkTextStruct_8006518(&gUnknown_203B274->s348.s0.unk3C);
gUnknown_203B274->s348.s0.unk3C.a0[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2C4;
gUnknown_203B274->s348.s0.unk38->unk14 = &gUnknown_203B274->s348.unk9C;
gUnknown_203B274->s348.unk9C.f0 = 1;
gUnknown_203B274->s348.unk9C.f1 = 0;
gUnknown_203B274->s348.unk9C.f2 = 0xC;
gUnknown_203B274->s348.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B274->s348.s0.input, sub_801F7E4(), 4, param_2);
sub_801F690();
sub_801F700();
@@ -108,7 +108,7 @@ u16 sub_801F5B4(void)
void sub_801F5F0(bool8 r0)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_203B274->s348.s0.input);
sub_801F690();
sub_801F700();
@@ -120,9 +120,9 @@ void sub_801F63C(void)
{
if(gUnknown_203B274 != NULL)
{
gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2AC;
gUnknown_203B274->s348.s0.unk3C.a0[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2AC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B274);
gUnknown_203B274 = NULL;
}
src/code_801F808.c
+9 -9
View File
@@ -24,7 +24,7 @@ struct unkStruct_203B278
MenuInputStruct unk28;
u32 unk5C;
UnkTextStruct2 *unk60;
UnkTextStruct2 unk64[4];
UnkTextStruct3 unk64;
UnkTextStruct2_sub2 unkC4;
MenuInputStructSub unkC8;
};
@@ -55,10 +55,10 @@ bool8 sub_801F808(u16 *moveIDs)
ResetSprites(TRUE);
gUnknown_203B278 = MemoryAlloc(sizeof(struct unkStruct_203B278), 8);
gUnknown_203B278->unk5C = 0;
gUnknown_203B278->unk60 = gUnknown_203B278->unk64;
sub_80140B4(gUnknown_203B278->unk64);
gUnknown_203B278->unk60 = &gUnknown_203B278->unk64.a0[0];
sub_80140B4(&gUnknown_203B278->unk64);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B278->unk64, TRUE, TRUE);
gUnknown_203B278->moveIDs = moveIDs;
for(index = 4; index > 1; index--)
@@ -93,9 +93,9 @@ void sub_801F8D0(void)
{
if(gUnknown_203B278)
{
gUnknown_203B278->unk64[gUnknown_203B278->unk5C] = sUnknown_80DC2F8;
gUnknown_203B278->unk64.a0[gUnknown_203B278->unk5C] = sUnknown_80DC2F8;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B278->unk64, TRUE, TRUE);
MemoryFree(gUnknown_203B278);
gUnknown_203B278 = NULL;
}
@@ -110,7 +110,7 @@ void sub_801F918(s32 newState)
void sub_801F930(void)
{
sub_80140B4(gUnknown_203B278->unk64);
sub_80140B4(&gUnknown_203B278->unk64);
switch(gUnknown_203B278->state)
{
case 0:
@@ -120,11 +120,11 @@ void sub_801F930(void)
gUnknown_203B278->unkC4.f2 = 0x10;
gUnknown_203B278->unkC4.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B278->unk64, TRUE, TRUE);
break;
case 1:
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B278->unk64, TRUE, TRUE);
break;
default:
break;
src/code_80227B8.c
+7 -7
View File
@@ -109,28 +109,28 @@ static void sub_802293C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B294->unk148);
RestoreUnkTextStruct_8006518(&sUnknown_203B294->unk148);
switch (sUnknown_203B294->state) {
case 2:
sub_8022D2C();
sUnknown_203B294->unk148[2] = sUnknown_80DC5BC;
sub_8012CAC(&sUnknown_203B294->unk148[2], sUnknown_203B294->unkF8);
sUnknown_203B294->unk148[2].unkC = 6;
sUnknown_203B294->unk148.a0[2] = sUnknown_80DC5BC;
sub_8012CAC(&sUnknown_203B294->unk148.a0[2], sUnknown_203B294->unkF8);
sUnknown_203B294->unk148.a0[2].unkC = 6;
break;
case 3:
sUnknown_203B294->unk148[1] = sUnknown_80DC5D4;
sUnknown_203B294->unk148.a0[1] = sUnknown_80DC5D4;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B294->unk148[i] = sUnknown_80DC5A4;
sUnknown_203B294->unk148.a0[i] = sUnknown_80DC5A4;
break;
case 10 ... 16:
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B294->unk148, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B294->unk148, TRUE, TRUE);
}
static void sub_8022A10(void)
src/code_8023144.c
+9 -9
View File
@@ -33,7 +33,7 @@ static void sub_8023730(void);
static void sub_8023758(void);
static void sub_80237E0(void);
bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3)
bool8 sub_8023144(s32 a0, s32 index, DungeonPos *sub, u32 a3)
{
u8 param_1_u8 = a0;
@@ -47,18 +47,18 @@ bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3)
gUnknown_3001B5C->unk4 = gUnknown_203B298;
gUnknown_3001B5C->s35C.s0.unk34 = index;
gUnknown_3001B5C->s35C.s0.unk38 = &gUnknown_3001B5C->s35C.s0.unk3C[index];
RestoreUnkTextStruct_8006518(gUnknown_3001B5C->s35C.s0.unk3C);
gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC91C;
gUnknown_3001B5C->s35C.s0.unk38 = &gUnknown_3001B5C->s35C.s0.unk3C.a0[index];
RestoreUnkTextStruct_8006518(&gUnknown_3001B5C->s35C.s0.unk3C);
gUnknown_3001B5C->s35C.s0.unk3C.a0[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC91C;
gUnknown_3001B5C->s35C.s0.unk38->unk14 = &gUnknown_3001B5C->s35C.unk9C;
if (sub != NULL)
gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34].unk8 = *sub;
gUnknown_3001B5C->s35C.s0.unk3C.a0[gUnknown_3001B5C->s35C.s0.unk34].pos = *sub;
sub_8012D08(gUnknown_3001B5C->s35C.s0.unk38, a3);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_3001B5C->s35C.s0.input, sub_80236A4(), a3, index);
gUnknown_3001B5C->s35C.s0.input.menuIndex = gUnknown_203B29C;
gUnknown_3001B5C->s35C.s0.input.unk1E = gUnknown_203B29E;
@@ -112,7 +112,7 @@ s16 sub_802331C(void)
void sub_8023354(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_3001B5C->s35C.s0.input);
sub_8023420();
sub_80234BC();
@@ -127,9 +127,9 @@ void sub_80233A0(void)
gUnknown_203B298 = gUnknown_3001B5C->unk4;
gUnknown_203B29C = gUnknown_3001B5C->s35C.s0.input.menuIndex;
gUnknown_203B29E = gUnknown_3001B5C->s35C.s0.input.unk1E;
gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC904;
gUnknown_3001B5C->s35C.s0.unk3C.a0[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC904;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_3001B5C);
gUnknown_3001B5C = NULL;
}
src/code_8024458.c
+6 -6
View File
@@ -26,9 +26,9 @@ bool8 sub_8024458(s16 speciesNum, s32 a1)
sUnknown_203B2AC = MemoryAlloc(sizeof(struct unkStruct_203B2AC), 8);
sUnknown_203B2AC->speciesNum = speciesNum_s32;
sUnknown_203B2AC->unkE0 = a1;
sUnknown_203B2AC->unkE4 = &sUnknown_203B2AC->unkE8[a1];
RestoreUnkTextStruct_8006518(sUnknown_203B2AC->unkE8);
sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9C8;
sUnknown_203B2AC->unkE4 = &sUnknown_203B2AC->unkE8.a0[a1];
RestoreUnkTextStruct_8006518(&sUnknown_203B2AC->unkE8);
sUnknown_203B2AC->unkE8.a0[sUnknown_203B2AC->unkE0] = sUnknown_80DC9C8;
sUnknown_203B2AC->unkE4->unk14 = &sUnknown_203B2AC->unk148;
sUnknown_203B2AC->unk148.f2 = 10;
sub_8024604();
@@ -64,9 +64,9 @@ void sub_802452C(void)
void sub_802453C(void)
{
if (sUnknown_203B2AC != NULL) {
sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9B0;
sUnknown_203B2AC->unkE8.a0[sUnknown_203B2AC->unkE0] = sUnknown_80DC9B0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2AC->unkE8, TRUE, TRUE);
MemoryFree(sUnknown_203B2AC);
sUnknown_203B2AC = NULL;
}
@@ -78,7 +78,7 @@ static void sub_8024588(void)
sUnknown_203B2AC->unk148.f1 = sUnknown_203B2AC->input.unk1E;
sUnknown_203B2AC->unk148.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2AC->unkE8, TRUE, TRUE);
}
static void sub_80245D0(void)
src/code_802DB28.c
+3 -3
View File
@@ -92,18 +92,18 @@ static void sub_802DC40(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B2FC->unk48);
RestoreUnkTextStruct_8006518(&sUnknown_203B2FC->unk48);
switch (sUnknown_203B2FC->state) {
case 0:
case 7:
for (i = 0; i < 4; i++)
sUnknown_203B2FC->unk48[i] = sUnknown_80E016C;
sUnknown_203B2FC->unk48.a0[i] = sUnknown_80E016C;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2FC->unk48, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2FC->unk48, TRUE, TRUE);
}
static void sub_802DC9C(void)
src/code_802DE84.c
+6 -6
View File
@@ -22,9 +22,9 @@ bool8 sub_802DE84(unkStruct_802C39C *mail)
sUnknown_203B300->mail = mail;
sub_801317C(&sUnknown_203B300->unk0);
sUnknown_203B300->unk10 = sUnknown_203B300->mail->unk0[0];
sUnknown_203B300->unk14 = &sUnknown_203B300->unk18[sUnknown_203B300->unk10];
RestoreUnkTextStruct_8006518(sUnknown_203B300->unk18);
sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0264;
sUnknown_203B300->unk14 = &sUnknown_203B300->unk18.a0[sUnknown_203B300->unk10];
RestoreUnkTextStruct_8006518(&sUnknown_203B300->unk18);
sUnknown_203B300->unk18.a0[sUnknown_203B300->unk10] = sUnknown_80E0264;
sub_802DF14();
return TRUE;
}
@@ -52,9 +52,9 @@ static void sub_802DF14(void)
void sub_802DF24(void)
{
if (sUnknown_203B300 != NULL) {
sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0248;
sUnknown_203B300->unk18.a0[sUnknown_203B300->unk10] = sUnknown_80E0248;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B300->unk18, TRUE, TRUE);
MemoryFree(sUnknown_203B300);
sUnknown_203B300 = NULL;
}
@@ -63,7 +63,7 @@ void sub_802DF24(void)
static void sub_802DF6C(void)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B300->unk18, TRUE, TRUE);
}
static void sub_802DF88(void)
src/code_8031D70.c
+7 -7
View File
@@ -19,7 +19,7 @@ struct unkStruct_203B334
MenuInputStructSub unk4;
u32 unk10;
UnkTextStruct2 *unk14;
UnkTextStruct2 unk18[4];
UnkTextStruct3 unk18;
u8 unk78[4];
};
@@ -58,9 +58,9 @@ bool8 sub_8031D70(u32 mailIndex, s32 param_2)
gUnknown_203B334->mailIndex = mailIndex;
sub_801317C(&gUnknown_203B334->unk4);
gUnknown_203B334->unk10 = param_2;
gUnknown_203B334->unk14 = &gUnknown_203B334->unk18[param_2];
RestoreUnkTextStruct_8006518(gUnknown_203B334->unk18);
gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FC4;
gUnknown_203B334->unk14 = &gUnknown_203B334->unk18.a0[param_2];
RestoreUnkTextStruct_8006518(&gUnknown_203B334->unk18);
gUnknown_203B334->unk18.a0[gUnknown_203B334->unk10] = gUnknown_80E1FC4;
sub_8031E00();
return TRUE;
}
@@ -90,9 +90,9 @@ void sub_8031E10(void)
{
if(gUnknown_203B334)
{
gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FA8;
gUnknown_203B334->unk18.a0[gUnknown_203B334->unk10] = gUnknown_80E1FA8;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B334->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B334);
gUnknown_203B334 = NULL;
}
@@ -101,7 +101,7 @@ void sub_8031E10(void)
void sub_8031E58(void)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B334->unk18, TRUE, TRUE);
}
void DrawSOSPasswordScreen(void)
src/code_803E724.c
+9 -9
View File
@@ -45,10 +45,10 @@ extern MenuInputStruct gUnknown_202EE10;
extern SpriteOAM gUnknown_202EDDC;
extern const RGB gUnknown_80F62AC;
extern const struct UnkTextStruct2 gUnknown_80F62B0[];
extern const struct UnkTextStruct2 gUnknown_80F6310[];
extern const struct UnkTextStruct2 gUnknown_80F6370[];
extern const struct UnkTextStruct2 gUnknown_80F63D0[];
extern const struct UnkTextStruct3 gUnknown_80F62B0;
extern const struct UnkTextStruct3 gUnknown_80F6310;
extern const struct UnkTextStruct3 gUnknown_80F6370;
extern const struct UnkTextStruct3 gUnknown_80F63D0;
extern const u32 gUnknown_80F6490[];
extern const s32 gUnknown_80F64B4[];
extern const s32 gUnknown_80F64FC[];
@@ -203,7 +203,7 @@ void sub_803EAF0(u32 a0, u8 *a1)
}
break;
case 3:
xxx_call_save_unk_text_struct_800641C(gUnknown_80F62B0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_80F62B0, TRUE, TRUE);
if (gUnknown_203B40C != 0) {
sub_8040ABC(1);
}
@@ -213,14 +213,14 @@ void sub_803EAF0(u32 a0, u8 *a1)
sub_8052210(0);
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_80F6310, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_80F6310, TRUE, TRUE);
break;
case 7:
if (gUnknown_203B40C != 0) {
sub_8052210(0);
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_80F6370, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_80F6370, TRUE, TRUE);
break;
case 2:
case 4:
@@ -250,7 +250,7 @@ void sub_803EAF0(u32 a0, u8 *a1)
sub_8083D44();
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_80F63D0, FALSE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_80F63D0, FALSE, TRUE);
break;
case 10:
sub_8083D44();
@@ -272,7 +272,7 @@ void sub_803EC94(void)
sub_801317C(&gUnknown_202EE10.unk28);
}
void sub_803ECB4(UnkTextStruct2 *a0, bool8 a1)
void sub_803ECB4(UnkTextStruct3 *a0, bool8 a1)
{
gUnknown_202EDD0 = 10;
sub_8052210(0);
src/code_805D8C8_1.c
+12 -20
View File
@@ -111,7 +111,7 @@ void sub_806752C(ActionContainer *a0);
bool8 sub_8061A38(ActionContainer *a0, bool8 a1);
void sub_8063A70(ActionContainer *a0, bool8 a1);
void sub_8063CF0(ActionContainer *a0, bool8 a1);
void sub_8067768(UNUSED ActionContainer *a0);
void sub_8067768(ActionContainer *a0);
void ShowTacticsMenu(ActionContainer *a0);
void sub_804A728(DungeonPos *pos, s32 a1, u8 a2, u8 a3);
extern bool8 sub_8071A8C(Entity *pokemon);
@@ -1675,14 +1675,6 @@ extern bool8 sub_8044F3C(s32 param_1);
extern s32 gUnknown_202EE6C;
extern const u8 gUnknown_8106B50[];
typedef struct UnkTextStruct3 {
UnkTextStruct2 a0[4];
// Something ugly, so that sub_805FD74 could match weird compiler memcpy/stack initialization
#ifndef NONMATCHING
u8 fakeMatch[0];
#endif // NONMATCHING
} UnkTextStruct3;
extern void sub_803ECB4(UnkTextStruct3 *a0, u8 a1);
static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3 *a4, UnkTextStruct2_sub2 *a5);
@@ -1692,8 +1684,8 @@ static inline void sub_805FC30_SetUpTxtStruct(UnkTextStruct3 *src)
memset(src, 0, sizeof(*src));
src->a0[0].unk4 = 3;
src->a0[1].unk4 = 3;
src->a0[1].unk8.unk0.separate.unk0 = 0x16;
src->a0[1].unk8.unk0.separate.unk2 = 4;
src->a0[1].pos.x = 0x16;
src->a0[1].pos.y = 4;
src->a0[1].unkC = 6;
src->a0[1].unkE = 4;
src->a0[1].unk10 = 4;
@@ -1724,7 +1716,7 @@ void sub_805FC30(UnkTextStruct3 *a0, s32 a1)
sub_801317C(&gUnknown_202EE10.unk28);
sp.a0[1].unk8.unk0.separate.unk0 = a1;
sp.a0[1].pos.x = a1;
sp.a0[1].unkC = 28 - a1;
sp.a0[1].unkE = sp.a0[1].unk10 = sub_80095E4(gUnknown_202EE10.unk1C, 0);
sub_803ECB4(&sp, 0);
@@ -1792,7 +1784,7 @@ bool8 sub_805FD74(Entity * a0, struct UnkMenuBitsStruct *a1)
[0] =
{
.unk4 = 6,
.unk8 = {2, 2},
.pos = {2, 2},
.unkC = 0x12,
.unkE = 0x10,
.unk10 = 0x10,
@@ -2097,11 +2089,11 @@ static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextS
if (a2) {
gUnknown_202EE10.unkC += 0x40;
a4->a0[0].unk8.unk0.separate.unk0 = 0xA;
a4->a0[0].pos.x = 0xA;
a4->a0[1] = var_94;
}
else {
a4->a0[0].unk8.unk0.separate.unk0 = 2;
a4->a0[0].pos.x = 2;
a4->a0[1] = a4->a0[3];
}
@@ -2531,8 +2523,8 @@ bool8 sub_8060E38(Entity *a0)
UnkTextStruct3 var_84 = {0};
var_84.a0[0].unk4 = 6;
var_84.a0[0].unk8.unk0.separate.unk0 = 2;
var_84.a0[0].unk8.unk0.separate.unk2 = 2;
var_84.a0[0].pos.x = 2;
var_84.a0[0].pos.y = 2;
var_84.a0[0].unkC = 0xE;
var_84.a0[0].unkE = 0x10;
var_84.a0[0].unk10 = 0x10;
@@ -2550,7 +2542,7 @@ bool8 sub_8060E38(Entity *a0)
if (!gDungeon->unk644.unk17) {
var_84.a0[0].unk4 = 3;
var_84.a0[0].unk8.unk0.arr[1]++;
var_84.a0[0].pos.y++;
}
while (1) {
@@ -2884,8 +2876,8 @@ static inline void SetTxtStruct(UnkTextStruct3 *sp)
{
memset(sp, 0, sizeof(*sp));
sp->a0[0].unk4 = 6;
sp->a0[0].unk8.unk0.separate.unk0 = 2;
sp->a0[0].unk8.unk0.separate.unk2 = 2;
sp->a0[0].pos.x = 2;
sp->a0[0].pos.y = 2;
sp->a0[0].unkC = 0x12;
sp->a0[0].unkE = 0xE;
sp->a0[0].unk10 = 0x12;
src/code_8066D04.c
+1065 -3
View File
File diff suppressed because it is too large Load Diff
src/code_8072F3C.c
+9 -9
View File
@@ -66,7 +66,7 @@ extern bool8 sub_802FCF0(void);
s32 sub_802FBF4(void);
extern u8 sub_8097384(s16);
u32 sub_802F73C(u32 r0, UnkTextStruct2_sub *r1, u32 r2, u8 r3)
u32 sub_802F73C(u32 r0, DungeonPos *r1, u32 r2, u8 r3)
{
if (sub_802FCF0())
return 0;
@@ -76,22 +76,22 @@ u32 sub_802F73C(u32 r0, UnkTextStruct2_sub *r1, u32 r2, u8 r3)
gUnknown_203B314->unkB8 = r3;
gUnknown_203B314->sBC.s0.unk34 = r0;
gUnknown_203B314->sBC.s0.unk38 = &gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34];
RestoreUnkTextStruct_8006518(gUnknown_203B314->sBC.s0.unk3C);
gUnknown_203B314->sBC.s0.unk38 = &gUnknown_203B314->sBC.s0.unk3C.a0[gUnknown_203B314->sBC.s0.unk34];
RestoreUnkTextStruct_8006518(&gUnknown_203B314->sBC.s0.unk3C);
if (r3 != 0)
gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E072C;
gUnknown_203B314->sBC.s0.unk3C.a0[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E072C;
else
gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E0714;
gUnknown_203B314->sBC.s0.unk3C.a0[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E0714;
gUnknown_203B314->sBC.s0.unk38->unk14 = &gUnknown_203B314->sBC.unk9C;
if (r1 != 0)
gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34].unk8 = *r1;
gUnknown_203B314->sBC.s0.unk3C.a0[gUnknown_203B314->sBC.s0.unk34].pos = *r1;
sub_8012D08(gUnknown_203B314->sBC.s0.unk38, r2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B314->sBC.s0.input, sub_802FBF4(), r2, r0);
sub_802F9C0();
sub_802FA50();
@@ -169,9 +169,9 @@ void sub_802F974(void)
{
if(gUnknown_203B314 != NULL)
{
gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E06FC;
gUnknown_203B314->sBC.s0.unk3C.a0[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E06FC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B314);
gUnknown_203B314 = NULL;
}
src/credits1.c
+3 -3
View File
@@ -31,11 +31,11 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2)
sCredits1Work->creditsCategoryIndex = creditsCategoryIndex;
for (i = 0; i < 4; i++)
sCredits1Work->unk0[i] = gUnknown_80E4A10;
sCredits1Work->unk0[0] = gUnknown_80E4A28;
sCredits1Work->unk0.a0[i] = gUnknown_80E4A10;
sCredits1Work->unk0.a0[0] = gUnknown_80E4A28;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(&sCredits1Work->unk0[0], TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sCredits1Work->unk0, TRUE, TRUE);
sub_8099690(2);
sub_80073B8(0);
src/debug_menu1.c
+4 -4
View File
@@ -47,10 +47,10 @@ void CreateDebugMenu(void)
}
for (i = 0; i < 4; i++)
sDebugMenu->unk140[i] = sUnknown_80E7D40;
sDebugMenu->unk140.a0[i] = sUnknown_80E7D40;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sDebugMenu->unk140, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sDebugMenu->unk140, TRUE, TRUE);
SetDebugMenuItems();
}
@@ -118,13 +118,13 @@ u32 UpdateDebugMenu(void)
static void SetDebugMenuItems(void)
{
SetMenuItems(sDebugMenu->unk0, sDebugMenu->unk140, 0, &sUnknown_80E7D58, sDebugMenuItems, TRUE, 13, FALSE);
SetMenuItems(sDebugMenu->unk0, &sDebugMenu->unk140, 0, &sUnknown_80E7D58, sDebugMenuItems, TRUE, 13, FALSE);
sub_8035CF4(sDebugMenu->unk0, 0, 1);
}
static void sub_803A3A0(void)
{
sub_8035CC0(sDebugMenu->unk140, 0);
sub_8035CC0(&sDebugMenu->unk140, 0);
}
static void sub_803A3BC(void)
src/debug_menu2.c
+6 -6
View File
@@ -80,23 +80,23 @@ static void sub_803A51C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B3F0->unkD8);
RestoreUnkTextStruct_8006518(&sUnknown_203B3F0->unkD8);
switch (sUnknown_203B3F0->state) {
case 3:
sUnknown_203B3F0->unkD8[1] = sUnknown_80E7E64;
sUnknown_203B3F0->unkD8.a0[1] = sUnknown_80E7E64;
break;
case 2:
sUnknown_203B3F0->unkD8[2] = sUnknown_80E7E4C;
sUnknown_203B3F0->unkD8.a0[2] = sUnknown_80E7E4C;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B3F0->unkD8[i] = sUnknown_80E7E34;
sUnknown_203B3F0->unkD8.a0[i] = sUnknown_80E7E34;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F0->unkD8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B3F0->unkD8, TRUE, TRUE);
}
static void sub_803A5A0(void)
@@ -121,7 +121,7 @@ static void sub_803A5A0(void)
sUnknown_203B3F0->unk9C.unkC = 999;
sUnknown_203B3F0->unk9C.unk4 = gTeamInventoryRef->teamStorage[sUnknown_203B3F0->id];
sUnknown_203B3F0->unk9C.unk14 = 1;
sUnknown_203B3F0->unk9C.unk18 = &sUnknown_203B3F0->unkD8[1];
sUnknown_203B3F0->unk9C.unk18 = &sUnknown_203B3F0->unkD8.a0[1];
sUnknown_203B3F0->unk9C.unk1C = 44;
sUnknown_203B3F0->unk9C.unk20 = 18;
sub_8013AA0(&sUnknown_203B3F0->unk9C);
src/debug_menu3.c
+4 -4
View File
@@ -79,17 +79,17 @@ static void sub_803A93C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B3F4->unk9C);
RestoreUnkTextStruct_8006518(&sUnknown_203B3F4->unk9C);
if (sUnknown_203B3F4->state == 2)
sUnknown_203B3F4->unk9C[2] = sUnknown_80E7EA4;
sUnknown_203B3F4->unk9C.a0[2] = sUnknown_80E7EA4;
else {
for(i = 0; i < 4; i++)
sUnknown_203B3F4->unk9C[i] = sUnknown_80E7E8C;
sUnknown_203B3F4->unk9C.a0[i] = sUnknown_80E7E8C;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F4->unk9C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B3F4->unk9C, TRUE, TRUE);
}
static void sub_803A9AC(void)
src/debug_menu4.c
+7 -7
View File
@@ -82,25 +82,25 @@ static void sub_803ACE8(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B3F8->unkE0);
RestoreUnkTextStruct_8006518(&sUnknown_203B3F8->unkE0);
switch (sUnknown_203B3F8->state) {
case 3:
sub_803AEB0();
sUnknown_203B3F8->unkE0[2] = sUnknown_80E7EEC;
sub_8012CAC(&sUnknown_203B3F8->unkE0[2], sUnknown_203B3F8->unk90);
sUnknown_203B3F8->unkE0.a0[2] = sUnknown_80E7EEC;
sub_8012CAC(&sUnknown_203B3F8->unkE0.a0[2], sUnknown_203B3F8->unk90);
break;
case 5:
sUnknown_203B3F8->unkE0[3] = sUnknown_80E7F04;
sUnknown_203B3F8->unkE0.a0[3] = sUnknown_80E7F04;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B3F8->unkE0[i] = sUnknown_80E7ED4;
sUnknown_203B3F8->unkE0.a0[i] = sUnknown_80E7ED4;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F8->unkE0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B3F8->unkE0, TRUE, TRUE);
}
static void sub_803AD88(void)
@@ -122,7 +122,7 @@ static void sub_803AD88(void)
sUnknown_203B3F8->unk60.unkC = 100;
sUnknown_203B3F8->unk60.unk4 = sUnknown_203B3F8->pokemon->level;
sUnknown_203B3F8->unk60.unk14 = 3;
sUnknown_203B3F8->unk60.unk18 = &sUnknown_203B3F8->unkE0[3];
sUnknown_203B3F8->unk60.unk18 = &sUnknown_203B3F8->unkE0.a0[3];
sUnknown_203B3F8->unk60.unk1C = 44;
sUnknown_203B3F8->unk60.unk20 = 18;
sub_8013AA0(&sUnknown_203B3F8->unk60);
src/dungeon_message.c
-11
View File
@@ -65,17 +65,6 @@ EWRAM_INIT u8 gUnknown_203B434 = 1;
#define FLAG_CAN_SCROLL_UP 0x1
#define FLAG_CAN_SCROLL_DOWN 0x2
// Needed to match :shrug:
static inline void InlineStrcpy(u8 *dst, const u8 *src)
{
strcpy(dst, src);
}
static inline void InlineStrncpy(u8 *dst, const u8 *src, s32 n)
{
strncpy(dst, src, n);
}
void sub_80521D0(void)
{
s32 i;
src/dungeon_move.c
+1 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "dungeon_move.h"
#include "dungeon_pokemon_attributes.h"
#include "dungeon_util.h"
#include "dungeon_message.h"
@@ -304,7 +305,6 @@ s32 HandleDamagingMove(Entity *, Entity *, Move *, s24_8, s32);
static s32 TryHitTarget(Entity *attacker, Entity *target, Move *move, struct DamageStruct *dmgStruct, s16 unk);
static void TriggerTargetAbilityEffect(Entity *attacker);
static bool8 AccuracyCalc(Entity *attacker, Entity *target, Move *move, s32 accuracyType, bool8 selfAlwaysHits);
bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, bool32 isLinkedMove, struct Move *move);
bool8 sub_8056468(Entity *entity, Move *move, const u8 *str, Entity **unkArray, bool32 itemId, bool8 arg_4, bool32 unused);
bool8 sub_805744C(Entity * pokemon, Move *move, bool8 param_3);
static void SetTargetsForMove(Entity **targetsArray, Entity *attacker, Move *move);
src/felicity_bank.c
+15 -15
View File
@@ -130,32 +130,32 @@ static void sub_801645C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sFelicityBankWork->unkA8);
RestoreUnkTextStruct_8006518(&sFelicityBankWork->unkA8);
switch (sFelicityBankWork->currState) {
case 2:
sFelicityBankWork->unkA8[0].unk0 = 0x80;
sFelicityBankWork->unkA8[1].unk0 = 0x80;
sFelicityBankWork->unkA8[2].unk0 = 0x80;
sFelicityBankWork->unkA8[3] = sUnknown_80DB6F4;
sFelicityBankWork->unkA8.a0[0].unk0 = 0x80;
sFelicityBankWork->unkA8.a0[1].unk0 = 0x80;
sFelicityBankWork->unkA8.a0[2].unk0 = 0x80;
sFelicityBankWork->unkA8.a0[3] = sUnknown_80DB6F4;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sFelicityBankWork->unkA8, TRUE, FALSE);
break;
case FELICITY_BANK_STORE_HOW_MUCH:
case FELICITY_BANK_TAKE_HOW_MUCH:
sFelicityBankWork->unkA8[0].unk0 = 0x80;
sFelicityBankWork->unkA8[1].unk0 = 0x80;
sFelicityBankWork->unkA8[3] = sUnknown_80DB6F4;
sFelicityBankWork->unkA8[2] = sUnknown_80DB70C;
sFelicityBankWork->unkA8.a0[0].unk0 = 0x80;
sFelicityBankWork->unkA8.a0[1].unk0 = 0x80;
sFelicityBankWork->unkA8.a0[3] = sUnknown_80DB6F4;
sFelicityBankWork->unkA8.a0[2] = sUnknown_80DB70C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sFelicityBankWork->unkA8, TRUE, FALSE);
break;
default:
for (i = 0; i < 4; i++)
sFelicityBankWork->unkA8[i] = sUnknown_80DB6DC;
sFelicityBankWork->unkA8.a0[i] = sUnknown_80DB6DC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sFelicityBankWork->unkA8, TRUE, TRUE);
break;
}
}
@@ -218,7 +218,7 @@ static void UpdateFelicityBankDialogue(void)
sFelicityBankWork->unk64.unk8 = 1;
sFelicityBankWork->unk64.unk10 = 5;
sFelicityBankWork->unk64.unk14 = 2;
sFelicityBankWork->unk64.unk18 = &sFelicityBankWork->unkA8[2];
sFelicityBankWork->unk64.unk18 = &sFelicityBankWork->unkA8.a0[2];
sFelicityBankWork->unk64.unk1C = 0x50;
sFelicityBankWork->unk64.unk20 = 0x12;
sub_8013AA0(&sFelicityBankWork->unk64);
@@ -253,7 +253,7 @@ static void UpdateFelicityBankDialogue(void)
sFelicityBankWork->unk64.unk8 = 1;
sFelicityBankWork->unk64.unk10 = 5;
sFelicityBankWork->unk64.unk14 = 2;
sFelicityBankWork->unk64.unk18 = &sFelicityBankWork->unkA8[2];
sFelicityBankWork->unk64.unk18 = &sFelicityBankWork->unkA8.a0[2];
sFelicityBankWork->unk64.unk1C = 0x50;
sFelicityBankWork->unk64.unk20 = 0x12;
sub_8013AA0(&sFelicityBankWork->unk64);
src/friend_area_action_menu.c
+8 -8
View File
@@ -142,29 +142,29 @@ void sub_802719C(void)
{
s32 index;
RestoreUnkTextStruct_8006518(sUnknown_203B2BC->unk180);
RestoreUnkTextStruct_8006518(&sUnknown_203B2BC->unk180);
switch(sUnknown_203B2BC->state)
{
case 3:
sUnknown_203B2BC->unk180[3] = sUnknown_80DD74C;
sUnknown_203B2BC->unk180.a0[3] = sUnknown_80DD74C;
CreateFriendActionMenu();
sUnknown_203B2BC->unk180[2] = sUnknown_80DD704;
sub_8012CAC(&sUnknown_203B2BC->unk180[2], sUnknown_203B2BC->menuItems);
sUnknown_203B2BC->unk180.a0[2] = sUnknown_80DD704;
sub_8012CAC(&sUnknown_203B2BC->unk180.a0[2], sUnknown_203B2BC->menuItems);
break;
case 0xC:
sub_80276A8();
sUnknown_203B2BC->unk180[2] = sUnknown_80DD71C;
sub_8012CAC(&sUnknown_203B2BC->unk180[2], sUnknown_203B2BC->menuItems);
sUnknown_203B2BC->unk180.a0[2] = sUnknown_80DD71C;
sub_8012CAC(&sUnknown_203B2BC->unk180.a0[2], sUnknown_203B2BC->menuItems);
break;
default:
for(index = 0; index < 4; index++)
{
sUnknown_203B2BC->unk180[index] = sUnknown_80DD6EC;
sUnknown_203B2BC->unk180.a0[index] = sUnknown_80DD6EC;
}
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2BC->unk180, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2BC->unk180, TRUE, TRUE);
}
void sub_8027274(void)
src/friend_list_menu.c
+8 -8
View File
@@ -145,31 +145,31 @@ void sub_802544C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(gUnknown_203B2B4->unk118);
RestoreUnkTextStruct_8006518(&gUnknown_203B2B4->unk118);
switch (gUnknown_203B2B4->state) {
case 3:
if (gUnknown_203B2B4->unk0 == 0)
gUnknown_203B2B4->unk118[3] = sUnknown_80DD190;
gUnknown_203B2B4->unk118.a0[3] = sUnknown_80DD190;
sub_8025728();
gUnknown_203B2B4->unk118[2] = sUnknown_80DD160;
sub_8012CAC(&gUnknown_203B2B4->unk118[2], gUnknown_203B2B4->unkC8);
gUnknown_203B2B4->unk118.a0[2] = sUnknown_80DD160;
sub_8012CAC(&gUnknown_203B2B4->unk118.a0[2], gUnknown_203B2B4->unkC8);
break;
case 13:
sub_802591C();
gUnknown_203B2B4->unk118[2] = sUnknown_80DD178;
sub_8012CAC(&gUnknown_203B2B4->unk118[2], gUnknown_203B2B4->unkC8);
gUnknown_203B2B4->unk118.a0[2] = sUnknown_80DD178;
sub_8012CAC(&gUnknown_203B2B4->unk118.a0[2], gUnknown_203B2B4->unkC8);
break;
default:
for (i = 0; i < 4; i++)
gUnknown_203B2B4->unk118[i] = sUnknown_80DD148;
gUnknown_203B2B4->unk118.a0[i] = sUnknown_80DD148;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2B4->unk118, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2B4->unk118, TRUE, TRUE);
}
void sub_8025518(void)
src/friend_rescue.c
+38 -38
View File
@@ -842,7 +842,7 @@ void sub_8032828(void)
CreateDialogueBoxAndPortrait(&gUnknown_80E2A0C[0], 0, 0, 0x101);
break;
case 0x3A:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B33C->unk218, 0);
@@ -900,8 +900,8 @@ void sub_8032828(void)
sub_8023868(3, 0, 0, 9);
break;
case 0x27:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E2334, gUnknown_80E234C, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, &gUnknown_203B33C->unk35C, 3, &gUnknown_80E2334, gUnknown_80E234C, TRUE, 0, FALSE);
sub_8023DA4();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@@ -1051,7 +1051,7 @@ void sub_8032828(void)
CreateDialogueBoxAndPortrait(&gUnknown_80E3078[0], 0, 0, 0x101);
break;
case 0x1A:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, gUnknown_203B33C->passwordBuffer);
@@ -1063,8 +1063,8 @@ void sub_8032828(void)
CreateDialogueBoxAndPortrait(gUnknown_80E30D0, 0, 0, 0x101);
break;
case 0x5D:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E2408, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, &gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E2408, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@@ -1073,14 +1073,14 @@ void sub_8032828(void)
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
{
UnkTextStruct2_sub local_x = {3, 2};
DungeonPos local_x = {3, 2};
sub_801C8C4(0, 1, &local_x, 9);
}
}
break;
case 0x60:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E23F0, gUnknown_80E2408, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, &gUnknown_203B33C->unk35C, 3, &gUnknown_80E23F0, gUnknown_80E2408, TRUE, 0, FALSE);
sub_801CCD8();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@@ -1116,7 +1116,7 @@ void sub_8032828(void)
CreateDialogueBoxAndPortrait(gUnknown_80E311C, 0, 0, 0x101);
break;
case 0x73:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, gUnknown_203B33C->passwordBuffer);
@@ -1126,7 +1126,7 @@ void sub_8032828(void)
break;
case 0x67:
case 0x2E:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B33C->unk218, 0);
@@ -1242,8 +1242,8 @@ void sub_8032828(void)
case 0x13:
case 0x1E:
case 0x33:
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E234C, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk35C);
SetMenuItems(gUnknown_203B33C->unk21C, &gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E234C, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
break;
@@ -1714,7 +1714,7 @@ void sub_8033DBC(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
@@ -1784,7 +1784,7 @@ void sub_8033FE4(void)
case 4:
gUnknown_203B33C->fallbackState = 0x1D;
gUnknown_203B33C->unk218 = sub_80307EC();
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -1809,7 +1809,7 @@ void sub_8034074(void)
break;
case 10:
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -1817,7 +1817,7 @@ void sub_8034074(void)
break;
case 5:
case 8:
sub_8035CC0(gUnknown_203B33C->unk35C, 2);
sub_8035CC0(&gUnknown_203B33C->unk35C, 2);
sub_8030810(0x1);
SetFriendRescueMenuState(0x1D);
break;
@@ -1832,7 +1832,7 @@ void sub_8034130(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@@ -1867,7 +1867,7 @@ void sub_803418C(void)
case 4:
gUnknown_203B33C->fallbackState = 0x26;
gUnknown_203B33C->speciesNum = sub_8023B44();
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B33C->speciesNum, 0);
@@ -1892,7 +1892,7 @@ void sub_8034254(void)
break;
case 10:
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B33C->speciesNum, 0);
@@ -1900,7 +1900,7 @@ void sub_8034254(void)
break;
case 5:
case 8:
sub_8035CC0(gUnknown_203B33C->unk35C, 3);
sub_8035CC0(&gUnknown_203B33C->unk35C, 3);
sub_8023DA4();
SetFriendRescueMenuState(0x26);
break;
@@ -1918,7 +1918,7 @@ void sub_8034310(void)
case 3:
sub_802453C();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_8023B7C(1);
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@@ -2036,7 +2036,7 @@ void sub_80344C0(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x2F);
break;
case 1:
@@ -2062,7 +2062,7 @@ void sub_8034500(void)
case 4:
gUnknown_203B33C->fallbackState = 0x32;
gUnknown_203B33C->unk218 = sub_80307EC();
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -2087,7 +2087,7 @@ void sub_8034590(void)
break;
case 10:
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -2095,7 +2095,7 @@ void sub_8034590(void)
break;
case 5:
case 8:
sub_8035CC0(gUnknown_203B33C->unk35C, 2);
sub_8035CC0(&gUnknown_203B33C->unk35C, 2);
sub_8030810(0x1);
SetFriendRescueMenuState(0x32);
break;
@@ -2110,7 +2110,7 @@ void sub_803464C(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@@ -2183,7 +2183,7 @@ void sub_803473C(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x3B);
break;
case 1:
@@ -2342,7 +2342,7 @@ void sub_8034970(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x68);
break;
case 1:
@@ -2386,7 +2386,7 @@ void sub_80349E0(void)
case 4:
gUnknown_203B33C->fallbackState = 0x5C;
gUnknown_203B33C->unk218 = sub_80307EC();
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -2411,7 +2411,7 @@ void sub_8034A70(void)
break;
case 10:
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
@@ -2419,7 +2419,7 @@ void sub_8034A70(void)
break;
case 5:
case 8:
sub_8035CC0(gUnknown_203B33C->unk35C, 2);
sub_8035CC0(&gUnknown_203B33C->unk35C, 2);
sub_8030810(0x1);
SetFriendRescueMenuState(0x5C);
break;
@@ -2434,7 +2434,7 @@ void sub_8034B2C(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@@ -2467,7 +2467,7 @@ void sub_8034B88(void)
case 4:
gUnknown_203B33C->fallbackState = 0x5F;
gUnknown_203B33C->item.id = sub_801CB24();
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B33C->item);
@@ -2484,7 +2484,7 @@ void sub_8034C38(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_801CB5C(TRUE);
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@@ -2516,7 +2516,7 @@ void sub_8034C98(void)
break;
case 10:
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC);
RestoreUnkTextStruct_8006518(&gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B33C->item);
@@ -2524,7 +2524,7 @@ void sub_8034C98(void)
break;
case 5:
case 8:
sub_8035CC0(gUnknown_203B33C->unk35C, 3);
sub_8035CC0(&gUnknown_203B33C->unk35C, 3);
sub_801CB5C(TRUE);
SetFriendRescueMenuState(0x5F);
break;
@@ -2582,7 +2582,7 @@ void sub_8034D74(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
src/gulpin_shop.c
+6 -6
View File
@@ -111,24 +111,24 @@ static void sub_801E980(void)
{
s32 index;
RestoreUnkTextStruct_8006518(sGulpinShopWork->unk12C);
RestoreUnkTextStruct_8006518(&sGulpinShopWork->unk12C);
switch (sGulpinShopWork->state) {
case 2:
sub_801EBC4();
sGulpinShopWork->unk12C[1] = gUnknown_80DC11C;
sGulpinShopWork->unk12C[2] = gUnknown_80DC134;
sub_8012CAC(&sGulpinShopWork->unk12C[2], sGulpinShopWork->unk28);
sGulpinShopWork->unk12C.a0[1] = gUnknown_80DC11C;
sGulpinShopWork->unk12C.a0[2] = gUnknown_80DC134;
sub_8012CAC(&sGulpinShopWork->unk12C.a0[2], sGulpinShopWork->unk28);
break;
default:
for(index = 0; index < 4; index++) {
sGulpinShopWork->unk12C[index] = gUnknown_80DC11C;
sGulpinShopWork->unk12C.a0[index] = gUnknown_80DC11C;
}
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sGulpinShopWork->unk12C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sGulpinShopWork->unk12C, TRUE, TRUE);
}
static void sub_801EA28(void)
src/gulpin_shop_801FB50.c
+18 -18
View File
@@ -194,45 +194,45 @@ static void sub_801FDC0(void)
{
s32 index;
RestoreUnkTextStruct_8006518(gUnknown_203B27C->unk180);
RestoreUnkTextStruct_8006518(&gUnknown_203B27C->unk180);
switch (gUnknown_203B27C->state) {
case 0x2:
gUnknown_203B27C->unk180[0].unk0 = 0x80;
gUnknown_203B27C->unk180[1].unk0 = 0x80;
gUnknown_203B27C->unk180[2].unk0 = 0x80;
gUnknown_203B27C->unk180[3] = gUnknown_80DC37C;
gUnknown_203B27C->unk180.a0[0].unk0 = 0x80;
gUnknown_203B27C->unk180.a0[1].unk0 = 0x80;
gUnknown_203B27C->unk180.a0[2].unk0 = 0x80;
gUnknown_203B27C->unk180.a0[3] = gUnknown_80DC37C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B27C->unk180, TRUE, FALSE);
break;
case 0x11:
sub_80205D0();
gUnknown_203B27C->unk180[2] = gUnknown_80DC334;
sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C);
gUnknown_203B27C->unk180.a0[2] = gUnknown_80DC334;
sub_8012CAC(&gUnknown_203B27C->unk180.a0[2], gUnknown_203B27C->unk7C);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B27C->unk180, TRUE, TRUE);
break;
case 0x17:
sub_802069C();
gUnknown_203B27C->unk180[2] = gUnknown_80DC334;
sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C);
gUnknown_203B27C->unk180.a0[2] = gUnknown_80DC334;
sub_8012CAC(&gUnknown_203B27C->unk180.a0[2], gUnknown_203B27C->unk7C);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B27C->unk180, TRUE, TRUE);
break;
case 0x20:
CreateGulpinLinkMenu();
gUnknown_203B27C->unk180[1] = gUnknown_80DC31C;
gUnknown_203B27C->unk180[2] = gUnknown_80DC34C;
sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C);
gUnknown_203B27C->unk180.a0[1] = gUnknown_80DC31C;
gUnknown_203B27C->unk180.a0[2] = gUnknown_80DC34C;
sub_8012CAC(&gUnknown_203B27C->unk180.a0[2], gUnknown_203B27C->unk7C);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B27C->unk180, TRUE, TRUE);
break;
default:
for (index = 0; index < 4; index++)
gUnknown_203B27C->unk180[index] = gUnknown_80DC31C;
gUnknown_203B27C->unk180.a0[index] = gUnknown_80DC31C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B27C->unk180, TRUE, TRUE);
break;
}
}
src/hints_menu1.c
+7 -7
View File
@@ -23,12 +23,12 @@ bool8 sub_801E3F0(u32 a0)
sUnknown_203B264 = MemoryAlloc(sizeof(*sUnknown_203B264), 8);
sUnknown_203B264->unk34 = a0;
sUnknown_203B264->unk38 = &sUnknown_203B264->unk3C[a0];
RestoreUnkTextStruct_8006518(sUnknown_203B264->unk3C);
sUnknown_203B264->unk3C[sUnknown_203B264->unk34] = sUnknown_80DC0BC;
sUnknown_203B264->unk38 = &sUnknown_203B264->unk3C.a0[a0];
RestoreUnkTextStruct_8006518(&sUnknown_203B264->unk3C);
sUnknown_203B264->unk3C.a0[sUnknown_203B264->unk34] = sUnknown_80DC0BC;
sub_8012D08(sUnknown_203B264->unk38, 10);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B264->unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B264->input, 5, 10, a0);
sub_801E594();
DrawHintSelectionMenu();
@@ -73,7 +73,7 @@ s32 GetChosenHintIndex(void)
void CreateHintSelectionScreen(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B264->unk3C, FALSE, FALSE);
sub_8013984(&sUnknown_203B264->input);
sub_801E594();
DrawHintSelectionMenu();
@@ -85,9 +85,9 @@ void CreateHintSelectionScreen(bool8 cursorSprite)
void sub_801E54C(void)
{
if (sUnknown_203B264 != NULL) {
sUnknown_203B264->unk3C[sUnknown_203B264->unk34] = sUnknown_80DC0A0;
sUnknown_203B264->unk3C.a0[sUnknown_203B264->unk34] = sUnknown_80DC0A0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B264->unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B264);
sUnknown_203B264 = NULL;
}
src/hints_menu2.c
+7 -7
View File
@@ -22,12 +22,12 @@ bool8 CreateHintDisplayScreen(u32 index)
{
sUnknown_203B268 = MemoryAlloc(sizeof(struct_Sub80095E4_2), 8);
sUnknown_203B268->s0.unk34 = 0;
sUnknown_203B268->s0.unk38 = sUnknown_203B268->s0.unk3C;
RestoreUnkTextStruct_8006518(sUnknown_203B268->s0.unk3C);
sUnknown_203B268->s0.unk3C[sUnknown_203B268->s0.unk34] = sUnknown_80DC0FC;
sUnknown_203B268->s0.unk38 = &sUnknown_203B268->s0.unk3C.a0[0];
RestoreUnkTextStruct_8006518(&sUnknown_203B268->s0.unk3C);
sUnknown_203B268->s0.unk3C.a0[sUnknown_203B268->s0.unk34] = sUnknown_80DC0FC;
sUnknown_203B268->s0.unk38->unk14 = &sUnknown_203B268->unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B268->s0.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B268->s0.input, 5, 1, sUnknown_203B268->s0.unk34);
sUnknown_203B268->s0.input.unk1E = index;
sub_801E714();
@@ -62,9 +62,9 @@ static void sub_801E714(void)
void DestroyHintDisplayScreen(void)
{
if (sUnknown_203B268 != NULL) {
sUnknown_203B268->s0.unk3C[sUnknown_203B268->s0.unk34] = sUnknown_80DC0E4;
sUnknown_203B268->s0.unk3C.a0[sUnknown_203B268->s0.unk34] = sUnknown_80DC0E4;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B268->s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B268);
sUnknown_203B268 = NULL;
}
@@ -77,7 +77,7 @@ static void sub_801E76C(void)
sUnknown_203B268->unk9C.f2 = 15;
sUnknown_203B268->unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B268->s0.unk3C, TRUE, TRUE);
}
static void DisplayChosenHint(void)
src/iq_skill_info_menu.c
+2 -2
View File
@@ -34,9 +34,9 @@ bool8 CreateIQSkillInfoMenu(u8 iqSkill)
sIQSkillInfoMenu->chosenIQSkill = iqSkill;
sub_801317C(&sIQSkillInfoMenu->unk88);
sIQSkillInfoMenu->unk24 = 0;
sub_80140B4(sIQSkillInfoMenu->unk28);
sub_80140B4(&sIQSkillInfoMenu->unk28);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillInfoMenu->unk28, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillInfoMenu->unk28, TRUE, TRUE);
SetIQSkillInfoMenuState(IQ_SKILL_INFO_MENU_INIT);
return TRUE;
}
src/iq_skill_list_menu.c
+8 -8
View File
@@ -30,13 +30,13 @@ bool8 CreateIQSkillListMenu(s16 species, u32 index, u32 a2)
sIQSkillListMenu->pokeStruct = &gRecruitedPokemonRef->pokemon[species_s32];
sIQSkillListMenu->numIQSkills = GetNumAvailableIQSkills(sIQSkillListMenu->iqSkills, sIQSkillListMenu->pokeStruct->IQ);
sIQSkillListMenu->s24.s0.unk34 = index;
sIQSkillListMenu->s24.s0.unk38 = &sIQSkillListMenu->s24.s0.unk3C[index];
RestoreUnkTextStruct_8006518(sIQSkillListMenu->s24.s0.unk3C);
sIQSkillListMenu->s24.s0.unk3C[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDF0;
sIQSkillListMenu->s24.s0.unk38 = &sIQSkillListMenu->s24.s0.unk3C.a0[index];
RestoreUnkTextStruct_8006518(&sIQSkillListMenu->s24.s0.unk3C);
sIQSkillListMenu->s24.s0.unk3C.a0[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDF0;
sIQSkillListMenu->s24.s0.unk38->unk14 = &sIQSkillListMenu->s24.unk9C;
sub_8012D08(sIQSkillListMenu->s24.s0.unk38, a2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
sub_8013818(&sIQSkillListMenu->s24.s0.input, sIQSkillListMenu->numIQSkills, a2, index);
sub_801C440();
BuildIQSkillList();
@@ -78,7 +78,7 @@ s32 GetIQSkillSelection(void)
void RedrawIQSkillListMenu(bool8 addCursor)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillListMenu->s24.s0.unk3C, FALSE, FALSE);
sIQSkillListMenu->s24.s0.input.unk22 = sIQSkillListMenu->numIQSkills;
sub_8013984(&sIQSkillListMenu->s24.s0.input);
sub_801C440();
@@ -91,9 +91,9 @@ void RedrawIQSkillListMenu(bool8 addCursor)
void CleanIQSkillListMenu(void)
{
if (sIQSkillListMenu != NULL) {
sIQSkillListMenu->s24.s0.unk3C[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDD8;
sIQSkillListMenu->s24.s0.unk3C.a0[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDD8;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
MemoryFree(sIQSkillListMenu);
sIQSkillListMenu = NULL;
}
@@ -106,7 +106,7 @@ static void sub_801C440(void)
sIQSkillListMenu->s24.unk9C.f2 = 10;
sIQSkillListMenu->s24.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE);
SUB_80095E4_CALL_2(sIQSkillListMenu->s24.s0);
}
src/iq_skill_menu.c
+4 -4
View File
@@ -77,17 +77,17 @@ static void sub_801BFCC(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sIQSkillMenu->unkC4);
RestoreUnkTextStruct_8006518(&sIQSkillMenu->unkC4);
if (sIQSkillMenu->state == 2)
sIQSkillMenu->unkC4[2] = sUnknown_80DBDB0;
sIQSkillMenu->unkC4.a0[2] = sUnknown_80DBDB0;
else {
for (i = 0; i < 4; i++)
sIQSkillMenu->unkC4[i] = sUnknown_80DBD98;
sIQSkillMenu->unkC4.a0[i] = sUnknown_80DBD98;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sIQSkillMenu->unkC4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sIQSkillMenu->unkC4, TRUE, TRUE);
}
static void HandleIQSkillMenuState(void)
src/kangaskhan_storage1.c
+14 -14
View File
@@ -145,38 +145,38 @@ static void sub_8016E80(void)
{
s32 index;
RestoreUnkTextStruct_8006518(gKangaskhanStorageWork->unkEC);
RestoreUnkTextStruct_8006518(&gKangaskhanStorageWork->unkEC);
switch (gKangaskhanStorageWork->currState) {
case 13:
case 14:
gKangaskhanStorageWork->unkEC[0] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[1] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[2] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[0] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[0] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[1] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[2] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[0] = sUnknown_80DB748;
break;
case 22:
case 23:
gKangaskhanStorageWork->unkEC[0] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[1] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[2] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC[0] = sUnknown_80DB778;
gKangaskhanStorageWork->unkEC.a0[0] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[1] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[2] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[0] = sUnknown_80DB778;
break;
case 24:
gKangaskhanStorageWork->unkEC[1] = sUnknown_80DB790;
gKangaskhanStorageWork->unkEC.a0[1] = sUnknown_80DB790;
break;
case 15:
case 25:
gKangaskhanStorageWork->unkEC[2] = sUnknown_80DB760;
gKangaskhanStorageWork->unkEC.a0[2] = sUnknown_80DB760;
break;
default:
for (index = 0; index < 4; index++)
gKangaskhanStorageWork->unkEC[index] = sUnknown_80DB748;
gKangaskhanStorageWork->unkEC.a0[index] = sUnknown_80DB748;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gKangaskhanStorageWork->unkEC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gKangaskhanStorageWork->unkEC, TRUE, TRUE);
}
static void sub_8016FF8(void)
@@ -309,7 +309,7 @@ static void sub_8016FF8(void)
gKangaskhanStorageWork->unkA8.unk4 = gKangaskhanStorageWork->unkA8.unkC;
gKangaskhanStorageWork->unkA8.unk14 = 1;
gKangaskhanStorageWork->unkA8.unk18 = &gKangaskhanStorageWork->unkEC[1];
gKangaskhanStorageWork->unkA8.unk18 = &gKangaskhanStorageWork->unkEC.a0[1];
gKangaskhanStorageWork->unkA8.unk1C = 40;
gKangaskhanStorageWork->unkA8.unk20 = 18;
sub_8013AA0(&gKangaskhanStorageWork->unkA8);
src/kangaskhan_storage2.c
+19 -19
View File
@@ -108,46 +108,46 @@ static void sub_8017F28(void)
{
s32 index;
RestoreUnkTextStruct_8006518(sUnknown_203B20C->unkF0);
RestoreUnkTextStruct_8006518(&sUnknown_203B20C->unkF0);
switch (sUnknown_203B20C->state) {
case KANGASKHAN_STORAGE_2_MAIN:
sUnknown_203B20C->unkF0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB7B8;
BuildKangaskhanStorage2MainMenu();
sUnknown_203B20C->unkF0[2] = sUnknown_80DB7D0;
sub_8012CAC(&sUnknown_203B20C->unkF0[2], sUnknown_203B20C->unk20);
sUnknown_203B20C->unkF0.a0[2] = sUnknown_80DB7D0;
sub_8012CAC(&sUnknown_203B20C->unkF0.a0[2], sUnknown_203B20C->unk20);
break;
case 4:
case 5:
sUnknown_203B20C->unkF0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[2] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[2] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB7B8;
break;
case 10:
case 11:
sUnknown_203B20C->unkF0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[2] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0[0] = sUnknown_80DB800;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[1] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[2] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[0] = sUnknown_80DB800;
break;
case 12:
sUnknown_203B20C->unkF0[1] = sUnknown_80DB818;
sUnknown_203B20C->unkF0.a0[1] = sUnknown_80DB818;
break;
case 6:
case 13:
sUnknown_203B20C->unkF0[2] = sUnknown_80DB7E8;
sUnknown_203B20C->unkF0.a0[2] = sUnknown_80DB7E8;
break;
default:
case KANGASKHAN_STORAGE_2_INIT:
for (index = 0; index < 4; index++)
sUnknown_203B20C->unkF0[index] = sUnknown_80DB7B8;
sUnknown_203B20C->unkF0.a0[index] = sUnknown_80DB7B8;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B20C->unkF0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B20C->unkF0, TRUE, TRUE);
}
static void sub_8018100(void)
@@ -189,7 +189,7 @@ static void sub_8018100(void)
sUnknown_203B20C->unkC0.unk4 = sUnknown_203B20C->unkC0.unkC;
sUnknown_203B20C->unkC0.unk14 = 1;
sUnknown_203B20C->unkC0.unk18 = &sUnknown_203B20C->unkF0[1];
sUnknown_203B20C->unkC0.unk18 = &sUnknown_203B20C->unkF0.a0[1];
sUnknown_203B20C->unkC0.unk1C = 40;
sUnknown_203B20C->unkC0.unk20 = 18;
sub_8013AA0(&sUnknown_203B20C->unkC0);
src/kecleon_bros1.c
+12 -12
View File
@@ -179,26 +179,26 @@ static void sub_8018D30(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sKecleonBrosWork1->unkE8);
RestoreUnkTextStruct_8006518(&sKecleonBrosWork1->unkE8);
switch (sKecleonBrosWork1->currState) {
case 18:
case 19:
sKecleonBrosWork1->unkE8[0] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8[2] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8[0] = sUnknown_80DB870;
sKecleonBrosWork1->unkE8[1] = sUnknown_80DB888;
sKecleonBrosWork1->unkE8.a0[0] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[2] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[0] = sUnknown_80DB870;
sKecleonBrosWork1->unkE8.a0[1] = sUnknown_80DB888;
break;
case 26:
case 27:
sKecleonBrosWork1->unkE8[0] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8[1] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8[2] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8[1] = sUnknown_80DB888;
sKecleonBrosWork1->unkE8.a0[0] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[1] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[2] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[1] = sUnknown_80DB888;
break;
case 20:
case 28:
sKecleonBrosWork1->unkE8[2] = sUnknown_80DB858;
sKecleonBrosWork1->unkE8.a0[2] = sUnknown_80DB858;
break;
default:
case KECLEON_STORE_BUY_ITEM_INFO:
@@ -207,12 +207,12 @@ static void sub_8018D30(void)
case KECLEON_STORE_SELL_ITEM_MENU:
case KECLEON_STORE_SELL_ITEM_RECEIPT:
for (i = 0; i < 4; i++)
sKecleonBrosWork1->unkE8[i] = sUnknown_80DB840;
sKecleonBrosWork1->unkE8.a0[i] = sUnknown_80DB840;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sKecleonBrosWork1->unkE8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sKecleonBrosWork1->unkE8, TRUE, TRUE);
}
static void UpdateKecleonStoreDialogue(void)
src/kecleon_bros2.c
+7 -7
View File
@@ -25,12 +25,12 @@ bool8 sub_8019E40(u32 r0)
gUnknown_203B214 = MemoryAlloc(sizeof(*gUnknown_203B214), 8);
gUnknown_203B214->s0.unk34 = r0;
gUnknown_203B214->s0.unk38 = &gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34];
RestoreUnkTextStruct_8006518(gUnknown_203B214->s0.unk3C);
gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34] = sUnknown_80DB8CC;
gUnknown_203B214->s0.unk38 = &gUnknown_203B214->s0.unk3C.a0[gUnknown_203B214->s0.unk34];
RestoreUnkTextStruct_8006518(&gUnknown_203B214->s0.unk3C);
gUnknown_203B214->s0.unk3C.a0[gUnknown_203B214->s0.unk34] = sUnknown_80DB8CC;
gUnknown_203B214->s0.unk38->unk14 = &gUnknown_203B214->unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B214->s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B214->s0.input, CountKecleonShopItems(), 10, r0);
gUnknown_203B214->s0.input.menuIndex = gUnknown_203B218;
sub_8013984(&gUnknown_203B214->s0.input);
@@ -84,7 +84,7 @@ u8 sub_8019FB0(void)
void sub_8019FCC(bool8 r0)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B214->s0.unk3C, FALSE, FALSE);
gUnknown_203B214->s0.input.unk22 = CountKecleonShopItems();
sub_8013984(&gUnknown_203B214->s0.input);
sub_801A064();
@@ -97,9 +97,9 @@ void sub_801A010(void)
{
if (gUnknown_203B214 != NULL) {
gUnknown_203B218 = gUnknown_203B214->s0.input.menuIndex;
gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34] = sUnknown_80DB8B4;
gUnknown_203B214->s0.unk3C.a0[gUnknown_203B214->s0.unk34] = sUnknown_80DB8B4;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B214->s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B214);
gUnknown_203B214 = NULL;
}
src/kecleon_bros3.c
+7 -7
View File
@@ -25,12 +25,12 @@ u8 sub_801A20C(u32 r0)
gUnknown_203B21C = MemoryAlloc(sizeof(*gUnknown_203B21C), 8);
gUnknown_203B21C->s0.unk34 = r0;
gUnknown_203B21C->s0.unk38 = &gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34];
RestoreUnkTextStruct_8006518(gUnknown_203B21C->s0.unk3C);
gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34] = sUnknown_80DB914;
gUnknown_203B21C->s0.unk38 = &gUnknown_203B21C->s0.unk3C.a0[gUnknown_203B21C->s0.unk34];
RestoreUnkTextStruct_8006518(&gUnknown_203B21C->s0.unk3C);
gUnknown_203B21C->s0.unk3C.a0[gUnknown_203B21C->s0.unk34] = sUnknown_80DB914;
gUnknown_203B21C->s0.unk38->unk14 = &gUnknown_203B21C->unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B21C->s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B21C->s0.input, CountKecleonWareItems(), 10, r0);
gUnknown_203B21C->s0.input.menuIndex = gUnknown_203B220;
sub_8013984(&gUnknown_203B21C->s0.input);
@@ -85,7 +85,7 @@ u8 sub_801A37C(void)
void sub_801A398(bool8 r0)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B21C->s0.unk3C, FALSE, FALSE);
gUnknown_203B21C->s0.input.unk22 = CountKecleonWareItems();
sub_8013984(&gUnknown_203B21C->s0.input);
sub_801A430();
@@ -98,9 +98,9 @@ void sub_801A3DC(void)
{
if (gUnknown_203B21C != NULL) {
gUnknown_203B220 = gUnknown_203B21C->s0.input.menuIndex;
gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34] = sUnknown_80DB8FC;
gUnknown_203B21C->s0.unk3C.a0[gUnknown_203B21C->s0.unk34] = sUnknown_80DB8FC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B21C->s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B21C);
gUnknown_203B21C = NULL;
}
src/kecleon_bros4.c
+10 -10
View File
@@ -23,7 +23,7 @@ static void SortInventoryItems(void);
static void sub_801A998(void);
static s32 sub_801AE24(u32);
bool8 sub_801A5D8(u32 param_1, s32 param_2, UnkTextStruct2_sub *param_3, u32 param_4)
bool8 sub_801A5D8(u32 param_1, s32 param_2, DungeonPos *param_3, u32 param_4)
{
if (GetNumberOfFilledInventorySlots() == 0)
return FALSE;
@@ -35,18 +35,18 @@ bool8 sub_801A5D8(u32 param_1, s32 param_2, UnkTextStruct2_sub *param_3, u32 par
FillInventoryGaps();
sub_801AE84();
gUnknown_203B224->unk54.s0.unk34 = param_2;
gUnknown_203B224->unk54.s0.unk38 = &gUnknown_203B224->unk54.s0.unk3C[param_2];
RestoreUnkTextStruct_8006518(gUnknown_203B224->unk54.s0.unk3C);
gUnknown_203B224->unk54.s0.unk3C[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB95C;
gUnknown_203B224->unk54.s0.unk38 = &gUnknown_203B224->unk54.s0.unk3C.a0[param_2];
RestoreUnkTextStruct_8006518(&gUnknown_203B224->unk54.s0.unk3C);
gUnknown_203B224->unk54.s0.unk3C.a0[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB95C;
gUnknown_203B224->unk54.s0.unk38->unk14 = &gUnknown_203B224->unk54.unk9C;
if (param_3 != NULL)
gUnknown_203B224->unk54.s0.unk3C[gUnknown_203B224->unk54.s0.unk34].unk8 = *param_3;
gUnknown_203B224->unk54.s0.unk3C.a0[gUnknown_203B224->unk54.s0.unk34].pos = *param_3;
sub_8012D08(gUnknown_203B224->unk54.s0.unk38, param_4);
sub_8099690(1);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B224->unk54.s0.input, GetNumberOfFilledInventorySlots(), param_4, param_2);
gUnknown_203B224->unk54.s0.input.menuIndex = gUnknown_203B228;
gUnknown_203B224->unk54.s0.input.unk1E = gUnknown_203B22A;
@@ -147,7 +147,7 @@ void sub_801A8D0(bool8 r0)
{
sub_8099690(1);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B224->unk54.s0.unk3C, FALSE, FALSE);
FillInventoryGaps();
gUnknown_203B224->unk54.s0.input.unk22 = GetNumberOfFilledInventorySlots();
sub_8013984(&gUnknown_203B224->unk54.s0.input);
@@ -162,10 +162,10 @@ void sub_801A928(void)
if (gUnknown_203B224 != NULL) {
gUnknown_203B228 = gUnknown_203B224->unk54.s0.input.menuIndex;
gUnknown_203B22A = gUnknown_203B224->unk54.s0.input.unk1E;
gUnknown_203B224->unk54.s0.unk3C[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB944;
gUnknown_203B224->unk54.s0.unk3C.a0[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB944;
sub_8099690(0);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B224);
gUnknown_203B224 = NULL;
}
@@ -178,7 +178,7 @@ static void sub_801A998(void)
gUnknown_203B224->unk54.unk9C.f2 = 11;
gUnknown_203B224->unk54.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE);
}
void sub_801A9E0(void)
src/load_screen.c
+10 -10
View File
@@ -29,7 +29,7 @@ struct LoadScreen
// size: 0x27c
u32 currMenu;
MenuStruct unk4[4];
UnkTextStruct2 unk144[4];
UnkTextStruct3 unk144;
/* 0x1A4 */ u8 formattedTeamName[0x24];
/* 0x1C8 */ u8 formattedPlayerName[0x24];
/* 0x1EC */ u8 formattedLocation[0x24];
@@ -168,29 +168,29 @@ void CreateLoadScreen(u32 currMenu)
}
gLoadScreen->currMenu = currMenu;
for(index = 0; index < 4; index++){
gLoadScreen->unk144[index] = gUnknown_80E75F8;
gLoadScreen->unk144.a0[index] = gUnknown_80E75F8;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gLoadScreen->unk144, TRUE, TRUE);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,FALSE);
xxx_call_save_unk_text_struct_800641C(&gLoadScreen->unk144, TRUE, TRUE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,FALSE);
switch(gLoadScreen->currMenu){
case MENU_CONTINUE:
if (IsQuickSave())
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeQuicksaveMenuItems,FALSE,6,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeQuicksaveMenuItems,FALSE,6,FALSE);
else
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeAdventureMenuItems,FALSE,6,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeAdventureMenuItems,FALSE,6,FALSE);
break;
case MENU_AWAITING_RESCUE:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gQuitWaitingRescueMenuItems,FALSE,6,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gQuitWaitingRescueMenuItems,FALSE,6,FALSE);
break;
case MENU_DELETE_SAVE_PROMPT:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C,gDeleteSavePromptMenuItems,FALSE,6,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gDeleteSavePromptMenuItems,FALSE,6,FALSE);
break;
case MENU_DELETE_SAVE_CONFIRM:
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,1,&gUnknown_80E762C, gDeleteSaveConfirmMenuItems,FALSE,6,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C, gDeleteSaveConfirmMenuItems,FALSE,6,FALSE);
break;
}
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,2,&gUnknown_80E7784,gLoadScreenYesNoMenu,TRUE,2,FALSE);
SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,2,&gUnknown_80E7784,gLoadScreenYesNoMenu,TRUE,2,FALSE);
sub_8035CF4(gLoadScreen->unk4,0,0);
sub_8035CF4(gLoadScreen->unk4,1,0);
sub_8035CF4(gLoadScreen->unk4,2,1);
src/luminous_cave.c
+4 -4
View File
@@ -180,12 +180,12 @@ static void sub_8024804(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sLuminousCaveWork->unk114);
RestoreUnkTextStruct_8006518(&sLuminousCaveWork->unk114);
switch (sLuminousCaveWork->state) {
case 8:
case 13:
sLuminousCaveWork->unk114[2] = sUnknown_80DCA00;
sLuminousCaveWork->unk114.a0[2] = sUnknown_80DCA00;
break;
case LUMINOUS_CAVE_LET_US_BEGIN:
case LUMINOUS_CAVE_CHANGED_APPEARANCE:
@@ -200,12 +200,12 @@ static void sub_8024804(void)
break;
default:
for (i = 0; i < 4; i++)
sLuminousCaveWork->unk114[i] = sUnknown_80DC9E8;
sLuminousCaveWork->unk114.a0[i] = sUnknown_80DC9E8;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sLuminousCaveWork->unk114, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sLuminousCaveWork->unk114, TRUE, TRUE);
}
static void UpdateLuminousCaveDialogue(void)
src/mailbox.c
+10 -10
View File
@@ -150,34 +150,34 @@ void SetMailboxState(u32 newState)
void sub_802E0A0(void)
{
s32 index;
RestoreUnkTextStruct_8006518(gUnknown_203B304->unk10C);
RestoreUnkTextStruct_8006518(&gUnknown_203B304->unk10C);
switch(gUnknown_203B304->state)
{
case MAIN_MAILBOX_MENU:
for(index = 0; index < 4; index++)
{
gUnknown_203B304->unk10C[index] = gUnknown_80E0284;
gUnknown_203B304->unk10C.a0[index] = gUnknown_80E0284;
}
CreateMailboxMenu();
gUnknown_203B304->unk10C[2] = gUnknown_80E029C;
sub_8012CAC(&gUnknown_203B304->unk10C[2], gUnknown_203B304->menuItems);
gUnknown_203B304->unk10C.a0[2] = gUnknown_80E029C;
sub_8012CAC(&gUnknown_203B304->unk10C.a0[2], gUnknown_203B304->menuItems);
break;
case MAIL_ACTION_MENU:
CreateMailActionMenu();
gUnknown_203B304->unk10C[2] = gUnknown_80E02B4;
sub_8012CAC(&gUnknown_203B304->unk10C[2], gUnknown_203B304->menuItems);
gUnknown_203B304->unk10C[2].unkC = 6;
gUnknown_203B304->unk10C[3] = gUnknown_80E02CC;
gUnknown_203B304->unk10C.a0[2] = gUnknown_80E02B4;
sub_8012CAC(&gUnknown_203B304->unk10C.a0[2], gUnknown_203B304->menuItems);
gUnknown_203B304->unk10C.a0[2].unkC = 6;
gUnknown_203B304->unk10C.a0[3] = gUnknown_80E02CC;
break;
default:
for(index = 0; index < 4; index++)
{
gUnknown_203B304->unk10C[index] = gUnknown_80E0284;
gUnknown_203B304->unk10C.a0[index] = gUnknown_80E0284;
}
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B304->unk10C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B304->unk10C, TRUE, TRUE);
}
void sub_802E1AC(void)
src/main_menu1.c
+8 -4
View File
@@ -291,9 +291,10 @@ void sub_8035C1C(void)
sMainMenu->sub.unk2D = 0;
}
void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextStruct2 *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, bool8 unused)
void SetMenuItems(MenuStruct *a0, UnkTextStruct3 *a1, s32 index, const UnkTextStruct2 *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, bool8 unused)
{
a1[index] = *a3;
UnkTextStruct2 *txtPtrs = a1->a0;
txtPtrs[index] = *a3;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(a1, TRUE, TRUE);
@@ -305,10 +306,13 @@ void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextSt
a0[index].unk4C = TRUE;
}
void sub_8035CC0(UnkTextStruct2 *dataArray, u32 index)
void sub_8035CC0(UnkTextStruct3 *dataArray, u32 index)
{
UnkTextStruct2 *txtPtrs;
RestoreUnkTextStruct_8006518(dataArray);
dataArray[index] = sUnknown_80E59A8;
txtPtrs = dataArray->a0;
txtPtrs[index] = sUnknown_80E59A8;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(dataArray, TRUE, TRUE);
}
src/main_menu2.c
+23 -23
View File
@@ -32,10 +32,10 @@ void DrawMainMenu(void)
}
for (i = 0; i < 4; i++)
sUnknown_203B34C->unk144[i] = sUnknown_80E59C8;
sUnknown_203B34C->unk144.a0[i] = sUnknown_80E59C8;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B34C->unk144, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B34C->unk144, TRUE, TRUE);
SetMainMenuItems();
sUnknown_203B34C->currMenuChoice = -1;
@@ -148,56 +148,56 @@ static bool8 SetMainMenuText(void)
return FALSE;
sUnknown_203B34C->currMenuChoice = menuChoice;
sub_8035CC0(sUnknown_203B34C->unk144, 2);
sub_8035CC0(sUnknown_203B34C->unk144, 3);
sub_8035CC0(&sUnknown_203B34C->unk144, 2);
sub_8035CC0(&sUnknown_203B34C->unk144, 3);
switch (menuChoice) {
case MENU_WIRELESS_COMMS:
// Using wireless communications, you can go on an adventure to unknown worlds.
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E6030, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E6030, FALSE, 0, FALSE);
break;
case MENU_WONDER_MAIL:
// Using passwords, you can receive Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F80, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F80, FALSE, 0, FALSE);
break;
case MENU_AWAITING_RESCUE:
// You are awaiting resuce by a friend
// You can give up waiting for rescue
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F1C, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5F1C, FALSE, 0, FALSE);
break;
case MENU_NEW_GAME:
// Start an entirely new adventure
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5CCC, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5CCC, FALSE, 0, FALSE);
break;
case MENU_CONTINUE:
// Resume your adventure from where you last saved
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DA0, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DA0, FALSE, 0, FALSE);
break;
case MENU_DELETE_SAVE_PROMPT:
// This will delete your saved game data.
// Beware! This will delete it forever
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DF0, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5DF0, FALSE, 0, FALSE);
break;
case MENU_ADVENTURE_LOG:
// Check your career as an adventurer
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D0C, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D0C, FALSE, 0, FALSE);
break;
case MENU_FRIEND_RESCUE:
// Using a Game Link cable or passwords, friends may rescue each other
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5E5C, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5E5C, FALSE, 0, FALSE);
break;
case MENU_TRADE_ITEMS:
// Using a Game Link cable you can trade stored items with a friend
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5EBC, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5EBC, FALSE, 0, FALSE);
break;
case MENU_DUAL_SLOT:
// Using Dual Slot function, you can receive teams from your friends
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5FCC, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5FCC, FALSE, 0, FALSE);
break;
case MENU_DEBUG:
// This is the Debug Mode.
// It won't be in the release version
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D48, FALSE, 0, FALSE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 2, &sUnknown_80E5CB4, sUnknown_80E5D48, FALSE, 0, FALSE);
break;
default:
break;
@@ -208,7 +208,7 @@ static bool8 SetMainMenuText(void)
static void sub_803623C(void)
{
sub_8035CC0(sUnknown_203B34C->unk144, 1);
sub_8035CC0(&sUnknown_203B34C->unk144, 1);
SetMainMenuItems();
sUnknown_203B34C->currMenuChoice = -1;
@@ -230,7 +230,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5C18, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5C18, TRUE, sUnknown_203B350, TRUE);
}
else {
// Revive Team
@@ -238,7 +238,7 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5BC4, sUnknown_80E5BDC, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5BC4, sUnknown_80E5BDC, TRUE, sUnknown_203B350, TRUE);
}
}
else {
@@ -249,7 +249,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5AFC, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5AFC, TRUE, sUnknown_203B350, TRUE);
}
else {
// Continue
@@ -257,7 +257,7 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A60, sUnknown_80E5A90, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5A60, sUnknown_80E5A90, TRUE, sUnknown_203B350, TRUE);
}
}
}
@@ -269,7 +269,7 @@ static void SetMainMenuItems(void)
// Friend Rescue
// Trade Items
// Wonder Mail
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5B8C, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5A78, sUnknown_80E5B8C, TRUE, sUnknown_203B350, TRUE);
}
else {
// Awaiting Rescue
@@ -277,14 +277,14 @@ static void SetMainMenuItems(void)
// Adventure Log
// Friend Rescue
// Trade Items
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E5B34, sUnknown_80E5B4C, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E5B34, sUnknown_80E5B4C, TRUE, sUnknown_203B350, TRUE);
}
}
}
else {
// New Game
// Adventure Log
SetMenuItems(sUnknown_203B34C->unk4, sUnknown_203B34C->unk144, 0, &sUnknown_80E59E0, sUnknown_80E59F8, TRUE, sUnknown_203B350, TRUE);
SetMenuItems(sUnknown_203B34C->unk4, &sUnknown_203B34C->unk144, 0, &sUnknown_80E59E0, sUnknown_80E59F8, TRUE, sUnknown_203B350, TRUE);
}
}
src/makuhita_dojo1.c
+3 -3
View File
@@ -152,21 +152,21 @@ static void sub_802FF1C(void)
{
s32 index;
RestoreUnkTextStruct_8006518(sMakuhitaDojoWork1->unk6C);
RestoreUnkTextStruct_8006518(&sMakuhitaDojoWork1->unk6C);
switch (sMakuhitaDojoWork1->state) {
case 0:
case 4:
case 13:
for(index = 0; index < 4; index++)
sMakuhitaDojoWork1->unk6C[index] = sUnknown_80E0760;
sMakuhitaDojoWork1->unk6C.a0[index] = sUnknown_80E0760;
break;
default:
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork1->unk6C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sMakuhitaDojoWork1->unk6C, TRUE, TRUE);
}
static void MakuhitaDojo_UpdateDialogue(void)
src/makuhita_dojo2.c
+8 -8
View File
@@ -22,7 +22,7 @@ static void MakuhitaDojo_DrawCourseList(void);
static void sub_80304C8(void);
static s32 sub_8030668(void);
bool8 sub_80302E8(s32 param_1, UnkTextStruct2_sub *param_2, u32 param_3)
bool8 sub_80302E8(s32 param_1, DungeonPos *param_2, u32 param_3)
{
if (MakuhitaDojo_ReturnFalse())
return FALSE;
@@ -31,17 +31,17 @@ bool8 sub_80302E8(s32 param_1, UnkTextStruct2_sub *param_2, u32 param_3)
sMakuhitaDojoWork2 = MemoryAlloc(sizeof(MakuhitaDojoWork2), 8);
sMakuhitaDojoWork2->s30.s0.unk34 = param_1;
sMakuhitaDojoWork2->s30.s0.unk38 = &sMakuhitaDojoWork2->s30.s0.unk3C[param_1];
RestoreUnkTextStruct_8006518(sMakuhitaDojoWork2->s30.s0.unk3C);
sMakuhitaDojoWork2->s30.s0.unk3C[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E0804;
sMakuhitaDojoWork2->s30.s0.unk38 = &sMakuhitaDojoWork2->s30.s0.unk3C.a0[param_1];
RestoreUnkTextStruct_8006518(&sMakuhitaDojoWork2->s30.s0.unk3C);
sMakuhitaDojoWork2->s30.s0.unk3C.a0[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E0804;
sMakuhitaDojoWork2->s30.s0.unk38->unk14 = &sMakuhitaDojoWork2->s30.unk9C;
if (param_2 != NULL)
sMakuhitaDojoWork2->s30.s0.unk3C[sMakuhitaDojoWork2->s30.s0.unk34].unk8 = *param_2;
sMakuhitaDojoWork2->s30.s0.unk3C.a0[sMakuhitaDojoWork2->s30.s0.unk34].pos = *param_2;
sub_8012D08(sMakuhitaDojoWork2->s30.s0.unk38, param_3);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE);
sub_8013818(&sMakuhitaDojoWork2->s30.s0.input, sub_8030668(), param_3, param_1);
sub_80304C8();
MakuhitaDojo_DrawCourseList();
@@ -91,9 +91,9 @@ UNUSED static void sub_8030444(bool8 a0)
void sub_8030480(void)
{
if (sMakuhitaDojoWork2 != NULL) {
sMakuhitaDojoWork2->s30.s0.unk3C[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E07EC;
sMakuhitaDojoWork2->s30.s0.unk3C.a0[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E07EC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE);
MemoryFree(sMakuhitaDojoWork2);
sMakuhitaDojoWork2 = NULL;
}
src/menu_input.c
+7 -7
View File
@@ -386,7 +386,7 @@ void sub_8012EBC(MenuStruct *param_1)
const u32 *colorArray;
s32 counter;
s32 index;
UnkTextStruct2 textStack[4];
UnkTextStruct3 textStack;
u8 buffer[256];
UnkTextStruct1 *ptr_text;
UnkTextStruct2 *ptr_text2;
@@ -397,8 +397,8 @@ void sub_8012EBC(MenuStruct *param_1)
ptr_text = &gUnknown_2027370[index];
if (ptr_text->unkC == 6) {
ptr_text2 = &textStack[index];
RestoreUnkTextStruct_8006518(textStack);
ptr_text2 = &textStack.a0[index];
RestoreUnkTextStruct_8006518(&textStack);
x = sub_8008ED0(param_1->unk0);
PrintFormattedStringOnWindow(((ptr_text2->unk14->f2 * 8 - x) / 2) + 8, 0, param_1->unk0, param_1->index, 0);
}
@@ -1152,7 +1152,7 @@ static bool8 sub_8013DD0(unkStructFor8013AA0 *a0)
void sub_8013E54(void)
{
UnkTextStruct1 *ptr = &gUnknown_2027370[0];
SpriteOAM SStack_18 = {0};
SpriteOAM SStack_18 = {0};
SpriteSetAffine1(&SStack_18, 0);
SpriteSetAffine2(&SStack_18, 0);
@@ -1174,7 +1174,7 @@ void sub_8013E54(void)
void sub_8013F84(void)
{
UnkTextStruct1 *ptr = &gUnknown_2027370[0];
SpriteOAM SStack_18 = {0};
SpriteOAM SStack_18 = {0};
SpriteSetAffine1(&SStack_18, 0);
SpriteSetAffine2(&SStack_18, 0);
@@ -1193,13 +1193,13 @@ void sub_8013F84(void)
AddSprite(&SStack_18,0x100,0,0x0);
}
void sub_80140B4(UnkTextStruct2 *a0)
void sub_80140B4(UnkTextStruct3 *a0)
{
s32 i;
for(i = 0; i < 4; i++)
{
a0[i] = gUnknown_80D47C8[i];
a0->a0[i] = gUnknown_80D47C8[i];
}
}
src/mission_reward.c
+4 -4
View File
@@ -22,7 +22,7 @@ struct unkStruct_203B310
/* 0xC */ s32 itemRewardIndex;
unkStruct_802F204 *unk10;
/* 0x14 */ struct MonPortraitMsg monPortrait;
UnkTextStruct2 unk24[4];
UnkTextStruct3 unk24;
};
EWRAM_INIT struct unkStruct_203B310 *gUnknown_203B310 = {NULL};
@@ -180,13 +180,13 @@ void sub_802F300(void)
switch(gUnknown_203B310->state)
{
case PREP_MONEY_REWARD:
RestoreUnkTextStruct_8006518(gUnknown_203B310->unk24);
RestoreUnkTextStruct_8006518(&gUnknown_203B310->unk24);
for(index = 0; index < 4; index++)
{
gUnknown_203B310->unk24[index] = gUnknown_80E041C;
gUnknown_203B310->unk24.a0[index] = gUnknown_80E041C;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B310->unk24, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B310->unk24, TRUE, TRUE);
default:
break;
}
src/options_menu1.c
+11 -11
View File
@@ -104,7 +104,7 @@ static void sub_801DD84(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B25C->unkBC);
RestoreUnkTextStruct_8006518(&sUnknown_203B25C->unkBC);
switch (sUnknown_203B25C->state) {
case OPTIONS_MENU_INIT:
@@ -118,30 +118,30 @@ static void sub_801DD84(void)
}
for(i = 0; i < 4; i++)
sUnknown_203B25C->unkBC[i] = sUnknown_80DBFB0;
sUnknown_203B25C->unkBC.a0[i] = sUnknown_80DBFB0;
sUnknown_203B25C->unkBC[0] = sUnknown_80DBFCC;
sub_8012CAC(&sUnknown_203B25C->unkBC[0], sUnknown_203B25C->menuItems);
sUnknown_203B25C->unkBC[0].unkC = 10;
sUnknown_203B25C->unkBC.a0[0] = sUnknown_80DBFCC;
sub_8012CAC(&sUnknown_203B25C->unkBC.a0[0], sUnknown_203B25C->menuItems);
sUnknown_203B25C->unkBC.a0[0].unkC = 10;
break;
case OPTIONS_MENU_MAIN:
CreateOthersMenu();
for (i = 0; i < 4; i++)
sUnknown_203B25C->unkBC[i] = sUnknown_80DBFB0;
sUnknown_203B25C->unkBC.a0[i] = sUnknown_80DBFB0;
sUnknown_203B25C->unkBC[0] = sUnknown_80DBFCC;
sub_8012CAC(&sUnknown_203B25C->unkBC[0], sUnknown_203B25C->menuItems);
sUnknown_203B25C->unkBC[0].unkC = 10;
sUnknown_203B25C->unkBC.a0[0] = sUnknown_80DBFCC;
sub_8012CAC(&sUnknown_203B25C->unkBC.a0[0], sUnknown_203B25C->menuItems);
sUnknown_203B25C->unkBC.a0[0].unkC = 10;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B25C->unkBC[i] = sUnknown_80DBFB0;
sUnknown_203B25C->unkBC.a0[i] = sUnknown_80DBFB0;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B25C->unkBC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B25C->unkBC, TRUE, TRUE);
}
static void sub_801DED0(void)
src/options_menu2.c
+6 -6
View File
@@ -22,12 +22,12 @@ bool8 sub_801E198(GameOptions *optionsMenu)
sUnknown_203B260->optionsMenu = optionsMenu;
sub_801317C(&sUnknown_203B260->unk4);
sUnknown_203B260->unk44 = 0;
sUnknown_203B260->unk48 = &sUnknown_203B260->unk4C[0];
RestoreUnkTextStruct_8006518(sUnknown_203B260->unk4C);
sUnknown_203B260->unk4C[sUnknown_203B260->unk44] = sUnknown_80DC03C;
sUnknown_203B260->unk48 = &sUnknown_203B260->unk4C.a0[0];
RestoreUnkTextStruct_8006518(&sUnknown_203B260->unk4C);
sUnknown_203B260->unk4C.a0[sUnknown_203B260->unk44] = sUnknown_80DC03C;
sub_8012D08(sUnknown_203B260->unk48, 1);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B260->unk4C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B260->unk4C, TRUE, TRUE);
sub_8013818(&sUnknown_203B260->input, 1, 1, sUnknown_203B260->unk44);
nullsub_38();
CreateOptionsMenu();
@@ -83,9 +83,9 @@ u32 sub_801E218(void)
void sub_801E2C4(void)
{
if (sUnknown_203B260 != NULL) {
sUnknown_203B260->unk4C[sUnknown_203B260->unk44] = sUnknown_80DC020;
sUnknown_203B260->unk4C.a0[sUnknown_203B260->unk44] = sUnknown_80DC020;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B260->unk4C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B260->unk4C, TRUE, TRUE);
MemoryFree(sUnknown_203B260);
sUnknown_203B260 = NULL;
}
src/other_menus1.c
+13 -13
View File
@@ -54,11 +54,11 @@ void sub_8036FDC(s32 param_1)
}
for (index2 = 0; index2 < 4; index2++)
sUnknown_203B35C->unk15C[index2] = sUnknown_80E653C;
sUnknown_203B35C->unk15C.a0[index2] = sUnknown_80E653C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B35C->unk15C, TRUE, TRUE);
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6CD0, sUnknown_80E6CE8, FALSE, 6, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B35C->unk15C, TRUE, TRUE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6CD0, sUnknown_80E6CE8, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
sub_80376CC();
}
@@ -128,17 +128,17 @@ static void sub_80371B8(void)
if (sUnknown_203B35C->unk0 < 2 && sUnknown_203B35C->linkStatus == COMMS_GOOD) {
if (sub_8037C10(FALSE) != 0) {
sub_80376CC();
sub_8035CC0(sUnknown_203B35C->unk15C, 0);
sub_8035CC0(&sUnknown_203B35C->unk15C, 0);
// Success!
// The item exchange with your friend
// went through successfully
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6C50, sUnknown_80E6C68, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6C50, sUnknown_80E6C68, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
}
}
else {
sub_80376CC();
sub_8035CC0(sUnknown_203B35C->unk15C, 0);
sub_8035CC0(&sUnknown_203B35C->unk15C, 0);
switch (sUnknown_203B35C->linkStatus) {
case 0:
@@ -194,7 +194,7 @@ static void sub_80371B8(void)
break;
}
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, puVar5, MenuItems, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, puVar5, MenuItems, FALSE, 6, FALSE);
sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE);
if (sUnknown_203B35C->linkStatus != COMMS_GOOD && sUnknown_203B35C->unk0 == 0) {
@@ -407,27 +407,27 @@ static void sub_8037810(void)
void sub_8037900(void)
{
sub_8035CC0(sUnknown_203B35C->unk15C, 0);
sub_8035CC0(&sUnknown_203B35C->unk15C, 0);
switch (sUnknown_203B35C->unk0) {
case 0:
case 1: {
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E656C, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E656C, FALSE, 6, FALSE);
break;
}
case 2:
case 3: {
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E65D8, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E65D8, FALSE, 6, FALSE);
break;
}
case 4:
case 5: {
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E661C, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E661C, FALSE, 6, FALSE);
break;
}
case 6:
case 7: {
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E665C, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E665C, FALSE, 6, FALSE);
break;
}
case 8: {
@@ -435,7 +435,7 @@ void sub_8037900(void)
}
case 9:
case 10: {
SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E667C, FALSE, 6, FALSE);
SetMenuItems(sUnknown_203B35C->unk1C, &sUnknown_203B35C->unk15C, 0, &sUnknown_80E6554, sUnknown_80E667C, FALSE, 6, FALSE);
break;
}
}
src/party_list_menu.c
+11 -11
View File
@@ -157,36 +157,36 @@ static void SetPartyListMenuState(s32 newState)
static void sub_802608C(void)
{
s32 index;
RestoreUnkTextStruct_8006518(sUnknown_203B2B8->unk220);
RestoreUnkTextStruct_8006518(&sUnknown_203B2B8->unk220);
switch(sUnknown_203B2B8->state)
{
case PARTY_LIST_STATE_MAIN_MENU:
case PARTY_LIST_STATE_MAIN_MENU_1:
for(index = 0; index < 4; index++)
{
sUnknown_203B2B8->unk220[index] = sUnknown_80DD310;
sUnknown_203B2B8->unk220.a0[index] = sUnknown_80DD310;
}
sUnknown_203B2B8->unk220[0] = sUnknown_80DD358;
sUnknown_203B2B8->unk220[3] = sUnknown_80DD370;
sUnknown_203B2B8->unk220.a0[0] = sUnknown_80DD358;
sUnknown_203B2B8->unk220.a0[3] = sUnknown_80DD370;
PartyListMenu_CreateMenu1();
sUnknown_203B2B8->unk220[2] = sUnknown_80DD328;
sub_8012CAC(&sUnknown_203B2B8->unk220[2], sUnknown_203B2B8->unk16C);
sUnknown_203B2B8->unk220[2].unkC = 9;
sUnknown_203B2B8->unk220.a0[2] = sUnknown_80DD328;
sub_8012CAC(&sUnknown_203B2B8->unk220.a0[2], sUnknown_203B2B8->unk16C);
sUnknown_203B2B8->unk220.a0[2].unkC = 9;
break;
case 0x14:
PartyListMenu_CreateMenu2();
sUnknown_203B2B8->unk220[2] = sUnknown_80DD340;
sub_8012CAC(&sUnknown_203B2B8->unk220[2], sUnknown_203B2B8->unk16C);
sUnknown_203B2B8->unk220.a0[2] = sUnknown_80DD340;
sub_8012CAC(&sUnknown_203B2B8->unk220.a0[2], sUnknown_203B2B8->unk16C);
break;
default:
for(index = 0; index < 4; index++)
{
sUnknown_203B2B8->unk220[index] = sUnknown_80DD310;
sUnknown_203B2B8->unk220.a0[index] = sUnknown_80DD310;
}
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2B8->unk220, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2B8->unk220, TRUE, TRUE);
}
void HandlePartyListMenuCallback(void)
src/pelipper_board.c
+10 -10
View File
@@ -145,34 +145,34 @@ void SetPelipperBoardState(u32 newState)
void sub_802E94C(void)
{
s32 index;
RestoreUnkTextStruct_8006518(gPelipperBoard->unk10C);
RestoreUnkTextStruct_8006518(&gPelipperBoard->unk10C);
switch(gPelipperBoard->state)
{
case MAIN_PELIPPER_BOARD_MENU:
for(index = 0; index < 4; index++)
{
gPelipperBoard->unk10C[index] = gUnknown_80E0330;
gPelipperBoard->unk10C.a0[index] = gUnknown_80E0330;
}
CreatePelipperBoardMenu();
gPelipperBoard->unk10C[2] = gUnknown_80E0348;
sub_8012CAC(&gPelipperBoard->unk10C[2], gPelipperBoard->menuItems);
gPelipperBoard->unk10C.a0[2] = gUnknown_80E0348;
sub_8012CAC(&gPelipperBoard->unk10C.a0[2], gPelipperBoard->menuItems);
break;
case 6:
sub_802EC10();
gPelipperBoard->unk10C[2] = gUnknown_80E0360;
sub_8012CAC(&gPelipperBoard->unk10C[2], gPelipperBoard->menuItems);
gPelipperBoard->unk10C[2].unkC = 6;
gPelipperBoard->unk10C[3] = gUnknown_80E0378;
gPelipperBoard->unk10C.a0[2] = gUnknown_80E0360;
sub_8012CAC(&gPelipperBoard->unk10C.a0[2], gPelipperBoard->menuItems);
gPelipperBoard->unk10C.a0[2].unkC = 6;
gPelipperBoard->unk10C.a0[3] = gUnknown_80E0378;
break;
default:
for(index = 0; index < 4; index++)
{
gPelipperBoard->unk10C[index] = gUnknown_80E0330;
gPelipperBoard->unk10C.a0[index] = gUnknown_80E0330;
}
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gPelipperBoard->unk10C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gPelipperBoard->unk10C, TRUE, TRUE);
}
void sub_802EA58(void)
src/personality_test1.c
+4 -4
View File
@@ -386,13 +386,13 @@ static void PersonalityTest_DisplayStarterSprite(void)
s32 paletteIndex;
s32 emotionId;
const u8 *gfx;
UnkTextStruct2 stackArray[4];
UnkTextStruct3 stackArray;
starterID = sPersonalityTestTracker->unk4.StarterID;
RestoreUnkTextStruct_8006518(stackArray);
stackArray[1] = sUnknown_80F4244;
RestoreUnkTextStruct_8006518(&stackArray);
stackArray.a0[1] = sUnknown_80F4244;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(stackArray, TRUE, FALSE);
xxx_call_save_unk_text_struct_800641C(&stackArray, TRUE, FALSE);
CallPrepareTextbox_8008C54(1);
sub_80073B8(1);
src/personality_test2.c
+8 -8
View File
@@ -33,12 +33,12 @@ void CreatePartnerSelectionMenu(s16 starterID)
sub_803CEAC();
gUnknown_203B404->StarterID = starterID_s32;
gUnknown_203B404->s18.s0.unk34 = 0;
gUnknown_203B404->s18.s0.unk38 = gUnknown_203B404->s18.s0.unk3C;
gUnknown_203B404->s18.s0.unk38 = &gUnknown_203B404->s18.s0.unk3C.a0[0];
gUnknown_203B404->s18.s0.unk3C[0] = gUnknown_80F4290;
gUnknown_203B404->s18.s0.unk3C[1] = gUnknown_80F42A8;
gUnknown_203B404->s18.s0.unk3C[2] = gUnknown_80F4278;
gUnknown_203B404->s18.s0.unk3C[3] = gUnknown_80F4278;
gUnknown_203B404->s18.s0.unk3C.a0[0] = gUnknown_80F4290;
gUnknown_203B404->s18.s0.unk3C.a0[1] = gUnknown_80F42A8;
gUnknown_203B404->s18.s0.unk3C.a0[2] = gUnknown_80F4278;
gUnknown_203B404->s18.s0.unk3C.a0[3] = gUnknown_80F4278;
gUnknown_203B404->s18.s0.unk38->unk14 = &gUnknown_203B404->s18.unk9C;
@@ -47,7 +47,7 @@ void CreatePartnerSelectionMenu(s16 starterID)
gUnknown_203B404->s18.unk9C.f2 = 6;
gUnknown_203B404->s18.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B404->s18.s0.input, GetValidPartners(), 10, gUnknown_203B404->s18.s0.unk34);
RedrawPartnerSelectionMenu();
PersonalityTest_DisplayPartnerSprite();
@@ -90,9 +90,9 @@ UNUSED static void sub_803CE34(bool8 cursorSprite)
void sub_803CE6C(void)
{
gUnknown_203B404->s18.s0.unk3C[gUnknown_203B404->s18.s0.unk34] = gUnknown_80F4278;
gUnknown_203B404->s18.s0.unk3C.a0[gUnknown_203B404->s18.s0.unk34] = gUnknown_80F4278;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE);
sub_803CECC();
}
src/pokemon_news1.c
+9 -9
View File
@@ -23,7 +23,7 @@ static s32 GetNumPKMNNews(void);
static void sub_802B880(void);
bool8 sub_802B640(u32 a0, UnkTextStruct2_sub *a1, u32 a2)
bool8 sub_802B640(u32 a0, DungeonPos *a1, u32 a2)
{
if (HasNoPKMNNews())
return FALSE;
@@ -32,18 +32,18 @@ bool8 sub_802B640(u32 a0, UnkTextStruct2_sub *a1, u32 a2)
sUnknown_203B2CC = MemoryAlloc(sizeof(struct unkStruct_203B2CC), 8);
sUnknown_203B2CC->s38.unk34 = a0;
sUnknown_203B2CC->s38.unk38 = &sUnknown_203B2CC->s38.unk3C[a0];
sUnknown_203B2CC->s38.unk38 = &sUnknown_203B2CC->s38.unk3C.a0[a0];
RestoreUnkTextStruct_8006518(sUnknown_203B2CC->s38.unk3C);
RestoreUnkTextStruct_8006518(&sUnknown_203B2CC->s38.unk3C);
sUnknown_203B2CC->s38.unk3C[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBEC;
sUnknown_203B2CC->s38.unk3C.a0[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBEC;
if (a1 != NULL)
sUnknown_203B2CC->s38.unk3C[sUnknown_203B2CC->s38.unk34].unk8 = *a1;
sUnknown_203B2CC->s38.unk3C.a0[sUnknown_203B2CC->s38.unk34].pos = *a1;
sub_8012D08(sUnknown_203B2CC->s38.unk38, a2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2CC->s38.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B2CC->s38.input, GetNumPKMNNews(), a2, a0);
@@ -92,7 +92,7 @@ u8 GetPokemonNewsIndex(void)
void sub_802B7D0(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2CC->s38.unk3C, FALSE, FALSE);
sUnknown_203B2CC->s38.input.unk22 = GetNumPKMNNews();
sub_8013984(&sUnknown_203B2CC->s38.input);
@@ -110,10 +110,10 @@ void sub_802B81C(void)
sUnknown_203B2D2 = sUnknown_203B2CC->s38.input.unk1E;
sUnknown_203B2CC->s38.unk3C[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBD0;
sUnknown_203B2CC->s38.unk3C.a0[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBD0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2CC->s38.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B2CC);
sUnknown_203B2CC = NULL;
src/pokemon_news2.c
+7 -7
View File
@@ -27,12 +27,12 @@ bool8 sub_802B9FC(u8 mailIndex)
sUnknown_203B2D4->currMailIndex = mailIndex;
sub_801317C(&sUnknown_203B2D4->unk88);
sUnknown_203B2D4->unk24 = 0;
sUnknown_203B2D4->unk28[0] = sUnknown_80DFC34;
sUnknown_203B2D4->unk28[1] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28[2] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28[3] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28.a0[0] = sUnknown_80DFC34;
sUnknown_203B2D4->unk28.a0[1] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28.a0[2] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28.a0[3] = sUnknown_80DFC18;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2D4->unk28, TRUE, TRUE);
sUnknown_203B2D4->unk8 = 0;
sub_802BCC4();
sub_802BC7C();
@@ -62,9 +62,9 @@ u32 sub_802BA8C(void)
void sub_802BACC(void)
{
if (sUnknown_203B2D4 != NULL) {
sUnknown_203B2D4->unk28[sUnknown_203B2D4->unk24] = sUnknown_80DFC18;
sUnknown_203B2D4->unk28.a0[sUnknown_203B2D4->unk24] = sUnknown_80DFC18;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2D4->unk28, TRUE, TRUE);
MemoryFree(sUnknown_203B2D4);
sUnknown_203B2D4 = NULL;
}
src/pokemon_news3.c
+9 -9
View File
@@ -26,7 +26,7 @@ static s32 CountEmptyMailSlots(void);
static void sub_802BF30(void);
bool8 sub_802BD14(s32 a0, UnkTextStruct2_sub *a1, u32 a2)
bool8 sub_802BD14(s32 a0, DungeonPos *a1, u32 a2)
{
if (HasNoMailinMailbox())
return FALSE;
@@ -35,17 +35,17 @@ bool8 sub_802BD14(s32 a0, UnkTextStruct2_sub *a1, u32 a2)
sUnknown_203B2D8 = MemoryAlloc(sizeof(struct unkStruct_203B2D8), 8);
sUnknown_203B2D8->unk4.s0.unk34 = a0;
sUnknown_203B2D8->unk4.s0.unk38 = &sUnknown_203B2D8->unk4.s0.unk3C[a0];
RestoreUnkTextStruct_8006518(sUnknown_203B2D8->unk4.s0.unk3C);
sUnknown_203B2D8->unk4.s0.unk3C[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC74;
sUnknown_203B2D8->unk4.s0.unk38 = &sUnknown_203B2D8->unk4.s0.unk3C.a0[a0];
RestoreUnkTextStruct_8006518(&sUnknown_203B2D8->unk4.s0.unk3C);
sUnknown_203B2D8->unk4.s0.unk3C.a0[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC74;
sUnknown_203B2D8->unk4.s0.unk38->unk14 = &sUnknown_203B2D8->unk4.unk9C;
if (a1 != NULL)
sUnknown_203B2D8->unk4.s0.unk3C[sUnknown_203B2D8->unk4.s0.unk34].unk8 = *a1;
sUnknown_203B2D8->unk4.s0.unk3C.a0[sUnknown_203B2D8->unk4.s0.unk34].pos = *a1;
sub_8012D34(sUnknown_203B2D8->unk4.s0.unk38, a2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE);
sub_8013848(&sUnknown_203B2D8->unk4.s0.input, CountEmptyMailSlots(), a2, a0);
sUnknown_203B2D8->unk4.s0.input.menuIndex = sUnknown_203B2DC;
sub_8013984(&sUnknown_203B2D8->unk4.s0.input);
@@ -89,7 +89,7 @@ u8 sub_802BE74(void)
void sub_802BE94(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2D8->unk4.s0.unk3C, FALSE, FALSE);
sUnknown_203B2D8->unk4.s0.input.unk22 = CountEmptyMailSlots();
sub_8013984(&sUnknown_203B2D8->unk4.s0.input);
@@ -104,9 +104,9 @@ void sub_802BEDC(void)
{
if (sUnknown_203B2D8 != NULL) {
sUnknown_203B2DC = sUnknown_203B2D8->unk4.s0.input.menuIndex;
sUnknown_203B2D8->unk4.s0.unk3C[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC5C;
sUnknown_203B2D8->unk4.s0.unk3C.a0[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC5C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B2D8);
sUnknown_203B2D8 = NULL;
}
src/post_office_guide2.c
+6 -6
View File
@@ -37,7 +37,7 @@ bool8 sub_80319A4(u8 param_1, u8 dungeon, s32 param_3)
sUnknown_203B330->dungeonIndex = dungeon;
sub_801317C(&sUnknown_203B330->input);
sUnknown_203B330->unk10 = param_3;
sUnknown_203B330->unk14 = &sUnknown_203B330->unk18[param_3];
sUnknown_203B330->unk14 = &sUnknown_203B330->unk18.a0[param_3];
sub_8031A2C();
return TRUE;
}
@@ -65,9 +65,9 @@ static void sub_8031A2C(void)
void sub_8031A3C(void)
{
if (sUnknown_203B330 != NULL) {
sUnknown_203B330->unk18[sUnknown_203B330->unk10] = sUnknown_80E1EFC;
sUnknown_203B330->unk18.a0[sUnknown_203B330->unk10] = sUnknown_80E1EFC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B330->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B330->unk18, TRUE, TRUE);
MemoryFree(sUnknown_203B330);
sUnknown_203B330 = NULL;
}
@@ -77,8 +77,8 @@ static void sub_8031A84(void)
{
s32 jobs;
RestoreUnkTextStruct_8006518(sUnknown_203B330->unk18);
sUnknown_203B330->unk18[sUnknown_203B330->unk10] = sUnknown_80E1F18;
RestoreUnkTextStruct_8006518(&sUnknown_203B330->unk18);
sUnknown_203B330->unk18.a0[sUnknown_203B330->unk10] = sUnknown_80E1F18;
if (sUnknown_203B330->unkC == 2) {
jobs = CountJobsinDungeon(sUnknown_203B330->dungeonIndex);
@@ -89,7 +89,7 @@ static void sub_8031A84(void)
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B330->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B330->unk18, TRUE, TRUE);
}
static void DisplayMissionObjectives(void)
src/rescue_password_menu.c
+14 -14
View File
@@ -265,10 +265,10 @@ void CreateRescuePasswordMenu(u32 currMenu)
}
for(counter = 0; counter < 4; counter++)
gRescuePasswordMenu->unk148[counter] = gUnknown_80E71E4;
gRescuePasswordMenu->unk148.a0[counter] = gUnknown_80E71E4;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gRescuePasswordMenu->unk148, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gRescuePasswordMenu->unk148, TRUE, TRUE);
if ((gUnknown_203B368 != 0) || (gUnknown_203B36C != currMenu)) {
for(counter = 0; counter < RESCUE_PASSWORD_SIZE; counter++)
@@ -543,37 +543,37 @@ s32 UpdateRescuePasswordMenu(void)
void DisplayRescuePasswordError(u32 passwordError)
{
RestoreUnkTextStruct_8006518(gRescuePasswordMenu->unk1A8);
RestoreUnkTextStruct_8006518(&gRescuePasswordMenu->unk1A8);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80155F0();
switch(passwordError) {
case PASSWORD_ENTRY_INCORRECT_PASSWORD:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E71FC,gUnknown_80E7214,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E71FC,gUnknown_80E7214,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_SOS_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E72EC,gUnknown_80E7304,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E72EC,gUnknown_80E7304,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7344,gUnknown_80E735C,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E7344,gUnknown_80E735C,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NO_SPACE:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7588,gUnknown_80E75A0,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E7588,gUnknown_80E75A0,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_AOK_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E73AC,gUnknown_80E73C4,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E73AC,gUnknown_80E73C4,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_AOK_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7408,gUnknown_80E7420,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E7408,gUnknown_80E7420,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_THANK_YOU_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7468,gUnknown_80E7480,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E7468,gUnknown_80E7480,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E74C8,gUnknown_80E74E0,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E74C8,gUnknown_80E74E0,FALSE,13,FALSE);
break;
case PASSWORD_ENTRY_NOT_WONDER_MAIL:
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E752C,gUnknown_80E7544,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E752C,gUnknown_80E7544,FALSE,13,FALSE);
break;
default:
break;
@@ -583,11 +583,11 @@ void DisplayRescuePasswordError(u32 passwordError)
void DisplayPasswordAcceptScreen(void)
{
RestoreUnkTextStruct_8006518(gRescuePasswordMenu->unk1A8);
RestoreUnkTextStruct_8006518(&gRescuePasswordMenu->unk1A8);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80155F0();
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,FALSE,13,FALSE);
SetMenuItems(gRescuePasswordMenu->unk8,&gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,FALSE,13,FALSE);
sub_8035CF4(gRescuePasswordMenu->unk8,0,TRUE);
}
src/save_menu.c
+10 -10
View File
@@ -130,19 +130,19 @@ void CreateSaveMenu(s32 currMenu)
MemoryFill8(sUnknown_203B364,0,sizeof(SaveMenuWork));
}
for(index = 0; index < 4; index++){
sUnknown_203B364->unk148[index] = gUnknown_80E6F20;
sUnknown_203B364->unk148.a0[index] = gUnknown_80E6F20;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B364->unk148, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B364->unk148, TRUE, TRUE);
if (currMenu == MENU_DELETE_SAVE) {
// Beware, Deleting your Adventure
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gDeletingYourAdventureMenuItems,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gDeletingYourAdventureMenuItems,
FALSE,6,FALSE);
}
else {
// Saving your Adventure
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gSavingAdventureMenuItems,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,gSavingAdventureMenuItems,
FALSE,6,FALSE);
}
sub_8035CF4(sUnknown_203B364->unk8,0,TRUE);
@@ -187,13 +187,13 @@ s32 UpdateSaveMenu(void)
switch(saveStatus)
{
case SAVE_COMPLETED:
sub_8035CC0(sUnknown_203B364->unk148,0);
sub_8035CC0(&sUnknown_203B364->unk148,0);
if (sUnknown_203B364->currMenu == MENU_DELETE_SAVE) {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gDeletedSaveMenuItems,FALSE,6,FALSE);
}
else {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureSavedMenuItems,FALSE,6,FALSE);
}
if (sUnknown_203B364->currMenu == 0x2d) {
@@ -208,13 +208,13 @@ s32 UpdateSaveMenu(void)
sUnknown_203B364->unk4 = 5;
break;
default:
sub_8035CC0(sUnknown_203B364->unk148,0);
sub_8035CC0(&sUnknown_203B364->unk148,0);
if (sUnknown_203B364->currMenu == MENU_DELETE_SAVE) {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureCouldNotBeDeletedMenuItems,FALSE,6,FALSE);
}
else {
SetMenuItems(sUnknown_203B364->unk8,sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
SetMenuItems(sUnknown_203B364->unk8,&sUnknown_203B364->unk148,0,&gUnknown_80E6F38,
gAdventureCouldNotBeSavedMenuItems,FALSE,6,FALSE);
}
sub_8035CF4(sUnknown_203B364->unk8,0,TRUE);
src/string_format.c
+52 -75
View File
@@ -59,41 +59,14 @@ u32 sub_8014140(void)
}
// This kinda looks like the 'true' beginning of the file
struct SubStruct_203B198
{
u8 unk0;
u32 unk4; // x34
u16 unk8; // x38
u16 unkA; // x3A
u16 unkC; // x3C
u16 unkE; // x3E
u16 unk10; // x40
u8 fill12[6]; // x42
};
struct UnkStruct_203B198
{
UnkTextStruct2 unk0;
u8 unk18;
u32 unk1C;
DungeonPos unk20;
u16 unk24;
u16 unk26;
u16 unk28;
u8 fill2A[4];
struct SubStruct_203B198 unk30;
struct SubStruct_203B198 unk48;
};
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 struct UnkTextStruct2 gUnknown_80D48AC = {
0x00,
0x00, 0x00,
0x00, 0x03,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00, 0x00
};
static const UnkTextStruct2 gUnknown_80D48C4 = {
@@ -176,7 +149,7 @@ static EWRAM_DATA s32 gUnknown_202EC1C = 0;
// Only read, but never written to. Possibly used in Blue?
struct NeverWrittenToStruct202EC20
{
struct SubStruct_203B198 unk0;
struct UnkTextStruct2 unk0;
const u8 *unk18;
};
static EWRAM_DATA struct NeverWrittenToStruct202EC20 *sNeverWrittenToUnknownStructPtr = NULL;
@@ -184,20 +157,24 @@ static UNUSED EWRAM_DATA u8 sUnusedEwram1[4] = {0};
static EWRAM_DATA MenuInputStructSub gUnknown_202EC28 = {0};
static EWRAM_INIT struct UnkStruct_203B198 sUnknown_203B198 = {
.unk0 = {
.unk8 = {2, 15},
.unkC = 26,
.unkE = 5,
.unk10 = 7,
},
.unk18 = 0x40,
.unk1C = 7,
.unk30 = {
.unk4 = 3,
},
.unk48 = {
.unk4 = 3,
static EWRAM_INIT UnkTextStruct3 sUnknown_203B198 = {
.a0 = {
[0] = {
.pos = {2, 15},
.unkC = 26,
.unkE = 5,
.unk10 = 7,
},
[1] = {
.unk0 = 0x40,
.unk4 = 7
},
[2] = {
.unk4 = 3,
},
[3] = {
.unk4 = 3,
}
}
};
@@ -250,41 +227,41 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me
gUnknown_202EC1C = r9;
sub_801317C(&gUnknown_202EC28);
if (flags & 0x10) {
sUnknown_203B198.unk0 = gUnknown_80D48DC;
sUnknown_203B198.a0[0] = gUnknown_80D48DC;
}
else {
sUnknown_203B198.unk0 = gUnknown_80D48C4;
sUnknown_203B198.a0[0] = gUnknown_80D48C4;
}
sUnknown_203B198.unk24 = 0;
sUnknown_203B198.unk26 = 0;
sUnknown_203B198.unk28 = 0;
sUnknown_203B198.unk18 = 0x40;
sUnknown_203B198.a0[1].unkC = 0;
sUnknown_203B198.a0[1].unkE = 0;
sUnknown_203B198.a0[1].unk10 = 0;
sUnknown_203B198.a0[1].unk0 = 0x40;
if (monPortraitPtr != NULL && monPortraitPtr->faceData != NULL && monPortraitPtr->faceData->sprites[monPortraitPtr->spriteId].gfx != 0) {
s32 i;
sUnknown_203B198.unk20.x = monPortraitPtr->pos.x;
sUnknown_203B198.unk20.y = monPortraitPtr->pos.y;
sUnknown_203B198.unk24 = 5;
sUnknown_203B198.unk26 = 5;
sUnknown_203B198.unk28 = 5;
sUnknown_203B198.a0[1].pos.x = monPortraitPtr->pos.x;
sUnknown_203B198.a0[1].pos.y = monPortraitPtr->pos.y;
sUnknown_203B198.a0[1].unkC = 5;
sUnknown_203B198.a0[1].unkE = 5;
sUnknown_203B198.a0[1].unk10 = 5;
for (i = 0; i < 16; i++) {
SetBGPaletteBufferColorArray(224 + i, &monPortraitPtr->faceData->sprites[monPortraitPtr->spriteId].pal[i]);
}
portraitOn = TRUE;
if (monPortraitPtr->unkE) {
sUnknown_203B198.unk1C = 7;
sUnknown_203B198.a0[1].unk4 = 7;
}
else {
sUnknown_203B198.unk1C = 5;
sUnknown_203B198.a0[1].unk4 = 5;
}
}
sUnknown_203B198.unk30 = gUnknown_80D48AC;
sUnknown_203B198.unk48 = gUnknown_80D48AC;
sUnknown_203B198.a0[2] = gUnknown_80D48AC;
sUnknown_203B198.a0[3] = gUnknown_80D48AC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B198.unk0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B198, TRUE, TRUE);
gUnknown_202E748.unk0 = 4;
gUnknown_202E748.unk2 = 4;
gUnknown_202E748.unk8 = 0x70;
@@ -644,21 +621,21 @@ static void sub_8014A88(void)
if (r5 % 8)
r2++;
sUnknown_203B198.unk30.unk4 = gUnknown_202EC10;
sUnknown_203B198.a0[2].unk4 = gUnknown_202EC10;
r1 = r7 / 8;
r1 += 2;
sUnknown_203B198.unk30.unkC = r1;
sUnknown_203B198.unk30.unk10 = r2;
sUnknown_203B198.unk30.unkE = r2;
sUnknown_203B198.unk30.unk8 = 28 - r1;
sUnknown_203B198.unk30.unkA = 14 - r2;
sUnknown_203B198.unk0.unk0 = 0x80;
sUnknown_203B198.unk18 = 0xC0;
sUnknown_203B198.a0[2].unkC = r1;
sUnknown_203B198.a0[2].unk10 = r2;
sUnknown_203B198.a0[2].unkE = r2;
sUnknown_203B198.a0[2].pos.x = 28 - r1;
sUnknown_203B198.a0[2].pos.y = 14 - r2;
sUnknown_203B198.a0[0].unk0 = 0x80;
sUnknown_203B198.a0[1].unk0 = 0xC0;
if (sNeverWrittenToUnknownStructPtr != NULL) {
sUnknown_203B198.unk48 = sNeverWrittenToUnknownStructPtr->unk0;
sUnknown_203B198.a0[3] = sNeverWrittenToUnknownStructPtr->unk0;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B198.unk0, TRUE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B198, TRUE, FALSE);
sub_8012D60(&gUnknown_202EBC0, sDialogueMenuItems, gUnknown_80D48A0, gUnknown_202EC18, gUnknown_202EC1C, 2);
if (sNeverWrittenToUnknownStructPtr != NULL) {
sub_80073B8(3);
src/text.c
+42 -40
View File
@@ -38,7 +38,7 @@ EWRAM_DATA static s32 sCurrentCharmap = 0;
EWRAM_DATA static vu32 sUnknown_20274B0 = 0;
EWRAM_DATA static u32 sUnknown_20274B4[0xEC0] = {0};
EWRAM_DATA static OpenedFile *sCharmapFiles[3] = {NULL};
EWRAM_DATA static UnkTextStruct2 sUnknown_202AFC0[4] = {0};
EWRAM_DATA static UnkTextStruct3 sUnknown_202AFC0 = {0};
EWRAM_DATA static s32 sUnknown_202B020 = 0;
EWRAM_DATA static s32 sUnknown_202B024 = 0;
EWRAM_DATA static s32 sCharHeight[2] = {0};
@@ -64,8 +64,8 @@ EWRAM_INIT void (*gIwramTextFunc4)(s32 a0) = sub_8272A78;
// This variable is only used in InitGraphics function, which may or may not belong to text.c
EWRAM_INIT u8 gUnknown_203B090 = 0;
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *a0, bool8 a1, bool8 a2, UnkTextStruct2_sub *a3);
static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, UnkTextStruct2_sub *a8, u8 a9);
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct3 *a0, bool8 a1, bool8 a2, DungeonPos *a3);
static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9);
static void sub_800677C(UnkTextStruct1 *a0, s32 a1, u16 *a2, u8 a3);
static void sub_80069CC(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, u16 *a4);
static void sub_8006AC4(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, u16 *a4);
@@ -86,7 +86,7 @@ static void sub_80084A4(UnkTextStruct1 *a0, u16 a1[32][32], u32 a2, s32 a3, s32
static void sub_8008818(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5);
static bool8 xxx_update_bg_vram(UnkTextStruct1 *a0);
static void sub_800898C(void);
static void sub_80089AC(const UnkTextStruct2 *r4, UnkTextStruct2_sub *r5_Str);
static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str);
static void PrepareTextbox_8008C6C(UnkTextStruct1 *strArr, u32 strId);
static void xxx_draw_string(UnkTextStruct1 *strArr, s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 characterSpacing, s32 lineSpacing);
static const u8 *HandleTextFormat(UnkTextStruct1 *strArr, const u8 *str, struct UnkDrawStringStruct *sp);
@@ -113,12 +113,14 @@ static const u32 gUnknown_80B853C[16] =
0xEEEEEEEE,
};
static const UnkTextStruct2 gUnknown_80B857C[4] =
static const UnkTextStruct3 gUnknown_80B857C =
{
[0] = {.unk4 = 3},
[1] = {.unk4 = 3},
[2] = {.unk4 = 3},
[3] = {.unk4 = 3},
.a0 = {
[0] = {.unk4 = 3},
[1] = {.unk4 = 3},
[2] = {.unk4 = 3},
[3] = {.unk4 = 3},
}
};
static const struct unkShiftData gCharMasksOffsets[8] =
@@ -273,14 +275,14 @@ void SetCharacterMask(int a0)
sTextShadowMask = retval;
}
void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct2 *a0, bool8 a1, bool8 a2)
void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct3 *a0, bool8 a1, bool8 a2)
{
UnkTextStruct2_sub r3 = {0, 0};
DungeonPos r3 = {0, 0};
SaveUnkTextStructAndXXX_8006438(a0, a1, a2, &r3);
}
// https://decomp.me/scratch/xF5Y1
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *a0, bool8 a1, bool8 a2, UnkTextStruct2_sub *a3)
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct3 *a0, bool8 a1, bool8 a2, DungeonPos *a3)
{
s32 i;
u32 r9;
@@ -288,19 +290,19 @@ static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *a0, bool8 a1,
r9 = 2;
if (a0 == NULL)
a0 = gUnknown_80B857C;
a0 = &gUnknown_80B857C;
if (a2)
sub_8009388();
sub_800898C();
for (i = 0; i < 4; i++) {
sUnknown_202AFC0[i] = a0[i];
sUnknown_202AFC0.a0[i] = a0->a0[i];
if (a0[i].unkC) {
sub_8006554(gUnknown_2027370, (u32 *)VRAM, sUnknown_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;
if (a0->a0[i].unkC) {
sub_8006554(gUnknown_2027370, (u32 *)VRAM, sUnknown_20274B4, &gUnknown_202B038[0][0][0], gUnknown_80B8804[i], &a0->a0[i], a1, r9, a3, 0);
sub_80089AC(&a0->a0[i], a3);
r9 += a0->a0[i].unkC * a0->a0[i].unk10;
}
}
@@ -317,11 +319,11 @@ UNUSED static void nullsub_152(void)
{
}
void RestoreUnkTextStruct_8006518(UnkTextStruct2 *unkData)
void RestoreUnkTextStruct_8006518(UnkTextStruct3 *unkData)
{
s32 iVar2;
for (iVar2 = 0; iVar2 < 4; iVar2++)
unkData[iVar2] = sUnknown_202AFC0[iVar2];
s32 i;
for (i = 0; i < 4; i++)
unkData->a0[i] = sUnknown_202AFC0.a0[i];
}
UNUSED static void nullsub_153(void)
@@ -334,7 +336,7 @@ u32 sub_8006544(u32 index)
}
// a1 is a VRAM pointer
static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, UnkTextStruct2_sub *a8, u8 a9)
static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9)
{
UnkTextStruct1 *t1;
s32 iVar3;
@@ -348,8 +350,8 @@ static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, c
s32 j;
t1 = &a0[a4];
iVar3 = a5->unk8.unk0.arr[0] + a8->unk0.arr[0];
iVar5 = a5->unk8.unk0.arr[1] + a8->unk0.arr[1];
iVar3 = a5->pos.x + a8->x;
iVar5 = a5->pos.y + a8->y;
t1->unk0 = iVar3;
t1->unk2 = iVar5;
t1->unk4 = a5->unkC;
@@ -2864,7 +2866,7 @@ static void sub_800898C(void)
}
}
static void sub_80089AC(const UnkTextStruct2 *r4, UnkTextStruct2_sub *r5_Str)
static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str)
{
u8 *r6;
@@ -2873,10 +2875,10 @@ static void sub_80089AC(const UnkTextStruct2 *r4, UnkTextStruct2_sub *r5_Str)
r6 = (void*) &gUnknown_3000E94;
if (r4->unk4 == 1) {
s32 r12 = (r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0) * 8;
s32 r5 = (r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2) * 8;
s32 r7 = (r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0 + r4->unkC) * 8;
s32 r2 = (r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2 + r4->unkE) * 8;
s32 r12 = (r4->pos.x + r5_Str->x) * 8;
s32 r5 = (r4->pos.y + r5_Str->y) * 8;
s32 r7 = (r4->pos.x + r5_Str->x + r4->unkC) * 8;
s32 r2 = (r4->pos.y + r5_Str->y + r4->unkE) * 8;
if (r4->unkE != 0) {
if (r5 < 0)
r5 = 0;
@@ -2907,11 +2909,11 @@ static void sub_80089AC(const UnkTextStruct2 *r4, UnkTextStruct2_sub *r5_Str)
}
else if (r4->unk4 == 6) {
s32 i;
s32 r9 = ((r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0) * 8) - 5;
s32 r5 = ((r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2) * 8) - 4;
s32 var_24 = ((r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0 + r4->unkC) * 8) + 5;
s32 r8 = ((r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2 + r4->unkE) * 8) + 5;
s32 r12 = ((r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0) * 8) + 3;
s32 r9 = ((r4->pos.x + r5_Str->x) * 8) - 5;
s32 r5 = ((r4->pos.y + r5_Str->y) * 8) - 4;
s32 var_24 = ((r4->pos.x + r5_Str->x + r4->unkC) * 8) + 5;
s32 r8 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) + 5;
s32 r12 = ((r4->pos.x + r5_Str->x) * 8) + 3;
const UnkTextStruct2_sub2 *r2 = r4->unk14;
s32 tmp = r2->f2 - 1;
s32 r10 = (((tmp + r2->f0 + 2) * 8) + r12) - 4;
@@ -2981,14 +2983,14 @@ static void sub_80089AC(const UnkTextStruct2 *r4, UnkTextStruct2_sub *r5_Str)
}
}
else {
s32 r8 = ((r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0) * 8) - 5;
s32 r3 = ((r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2) * 8) - 5;
s32 r12 = ((r4->unk8.unk0.separate.unk0 + r5_Str->unk0.separate.unk0 + r4->unkC) * 8) + 5;
s32 r5 = ((r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2 + r4->unkE) * 8) + 5;
s32 r8 = ((r4->pos.x + r5_Str->x) * 8) - 5;
s32 r3 = ((r4->pos.y + r5_Str->y) * 8) - 5;
s32 r12 = ((r4->pos.x + r5_Str->x + r4->unkC) * 8) + 5;
s32 r5 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) + 5;
if (r4->unkE != 0) {
if (r4->unk4 == 0) {
r3 += 8;
r5 = ((r4->unk8.unk0.separate.unk2 + r5_Str->unk0.separate.unk2 + r4->unkE) * 8) - 3;
r5 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) - 3;
}
if (r3 < 0)
r3 = 0;
src/thank_you_wonder_mail.c
+17 -17
View File
@@ -525,7 +525,7 @@ void sub_802A050(void)
case 2:
sub_8031E10();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C4->unk3BC, TRUE, TRUE);
SetThankYouMailMenuState(0x1B);
break;
case 1:
@@ -571,7 +571,7 @@ void sub_802A0C8(void)
case 4:
sUnknown_203B2C4->fallbackState = 0x10;
sUnknown_203B2C4->mailIndex = sub_80307EC();
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C4->mailIndex,0);
@@ -607,7 +607,7 @@ void sub_802A174(void)
break;
case INFO_ACTION:
sUnknown_203B2C4->fallbackState = 0x2b;
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C4->mailIndex,0);
@@ -615,7 +615,7 @@ void sub_802A174(void)
break;
case CANCEL_ACTION:
case 0xD:
sub_8035CC0(sUnknown_203B2C4->unk35C,2);
sub_8035CC0(&sUnknown_203B2C4->unk35C,2);
sub_8030810(1);
SetThankYouMailMenuState(0x10);
default:
@@ -631,7 +631,7 @@ void sub_802A230(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C4->unk3BC, TRUE, TRUE);
sub_803092C();
if (sUnknown_203B2C4->fallbackState == 0x2b) {
sub_8035CF4(sUnknown_203B2C4->unk21C, 3, TRUE);
@@ -666,7 +666,7 @@ void sub_802A28C(void)
case 4:
sUnknown_203B2C4->fallbackState = 0x13;
sUnknown_203B2C4->unk41C.id = sub_801CB24();
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&sUnknown_203B2C4->unk41C);
@@ -683,7 +683,7 @@ void sub_802A33C(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C4->unk3BC, TRUE, TRUE);
sub_801CB5C(TRUE);
if (sUnknown_203B2C4->fallbackState == 0x2b) {
sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE);
@@ -717,7 +717,7 @@ void sub_802A39C(void)
break;
case INFO_ACTION:
sUnknown_203B2C4->fallbackState = 0x2b;
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&sUnknown_203B2C4->unk41C);
@@ -725,7 +725,7 @@ void sub_802A39C(void)
break;
case CANCEL_ACTION:
case 0xD:
sub_8035CC0(sUnknown_203B2C4->unk35C, 3);
sub_8035CC0(&sUnknown_203B2C4->unk35C, 3);
sub_801CCD8();
SetThankYouMailMenuState(0x13);
default:
@@ -832,7 +832,7 @@ void HandleThankYouMailPasswordMenu(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C4->unk3BC, TRUE, TRUE);
SetThankYouMailMenuState(ANYTHING_ELSE_THANK_YOU_MAIN_MENU);
break;
}
@@ -1273,8 +1273,8 @@ void UpdateThankYouMailText(void)
sub_80306A8(WONDER_MAIL_TYPE_THANK_YOU,0,0,6);
break;
case 0x11:
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk35C);
SetMenuItems(sUnknown_203B2C4->unk21C,sUnknown_203B2C4->unk35C,3,&gUnknown_80DED60,gUnknown_80DED78,TRUE,0,FALSE);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk35C);
SetMenuItems(sUnknown_203B2C4->unk21C,&sUnknown_203B2C4->unk35C,3,&gUnknown_80DED60,gUnknown_80DED78,TRUE,0,FALSE);
sub_803092C();
sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE);
break;
@@ -1284,13 +1284,13 @@ void UpdateThankYouMailText(void)
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
{
UnkTextStruct2_sub local_x = {3, 2};
DungeonPos local_x = {3, 2};
sub_801C8C4(0, 1, &local_x, 9);
}
break;
case 0x14:
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk35C);
SetMenuItems(sUnknown_203B2C4->unk21C,sUnknown_203B2C4->unk35C,3,&gUnknown_80DED48,gUnknown_80DED78,TRUE,0,FALSE);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk35C);
SetMenuItems(sUnknown_203B2C4->unk21C,&sUnknown_203B2C4->unk35C,3,&gUnknown_80DED48,gUnknown_80DED78,TRUE,0,FALSE);
sub_801CCD8();
sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE);
break;
@@ -1336,13 +1336,13 @@ void UpdateThankYouMailText(void)
CreateDialogueBoxAndPortrait(gUnknown_80DF380,0,&sUnknown_203B2C4->monPortrait,0x10d);
break;
case PROCESS_THANK_YOU_PASSWORD:
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80151C0(4,sUnknown_203B2C4->passwordBuffer);
break;
case 0x1a:
RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8031D70(sUnknown_203B2C4->mailIndex,0);
src/trade_items_menu.c
+12 -12
View File
@@ -176,7 +176,7 @@ void sub_80365AC(void)
sTradeItemsMenu->fallbackState = TRADE_ITEMS_SEND_ITEM_SELECTION;
sTradeItemsMenu->itemToSend.id = sub_801CB24();
sTradeItemsMenu->itemToSend.quantity = 1;
RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk1E4);
RestoreUnkTextStruct_8006518(&sTradeItemsMenu->unk1E4);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&sTradeItemsMenu->itemToSend);
@@ -200,7 +200,7 @@ void sub_8036674(void)
break;
case 4: // Info
sTradeItemsMenu->fallbackState = 0x13;
RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk1E4);
RestoreUnkTextStruct_8006518(&sTradeItemsMenu->unk1E4);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&sTradeItemsMenu->itemToSend);
@@ -209,7 +209,7 @@ void sub_8036674(void)
case 7:
case 0:
// Cancel
sub_8035CC0(sTradeItemsMenu->unk184, 3);
sub_8035CC0(&sTradeItemsMenu->unk184, 3);
sub_801CCD8();
SetTradeItemMenu(TRADE_ITEMS_SEND_ITEM_SELECTION);
break;
@@ -224,7 +224,7 @@ void sub_8036728(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sTradeItemsMenu->unk1E4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sTradeItemsMenu->unk1E4, TRUE, TRUE);
sub_801CB5C(TRUE);
if (sTradeItemsMenu->fallbackState == 0x13) {
sub_8035CF4(sTradeItemsMenu->unk44, 3, TRUE);
@@ -252,7 +252,7 @@ void sub_8036788(void)
break;
case 2:
// If you back out of the # selection
sub_8035CC0(sTradeItemsMenu->unk184, 2);
sub_8035CC0(&sTradeItemsMenu->unk184, 2);
sub_801CCD8();
sub_8035CF4(sTradeItemsMenu->unk44, 3, TRUE);
SetTradeItemMenu(TRADE_ITEMS_SEND_ITEM_POPUP_MENU);
@@ -499,14 +499,14 @@ void sub_8036B28(void)
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
{
UnkTextStruct2_sub local_10 = {3, 2};
DungeonPos local_10 = {3, 2};
sub_801C8C4(0,1,&local_10,9);
}
}
break;
case TRADE_ITEMS_SEND_ITEM_POPUP_MENU:
RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk184);
SetMenuItems(sTradeItemsMenu->unk44,sTradeItemsMenu->unk184,3,&sUnknown_80E60EC,
RestoreUnkTextStruct_8006518(&sTradeItemsMenu->unk184);
SetMenuItems(sTradeItemsMenu->unk44,&sTradeItemsMenu->unk184,3,&sUnknown_80E60EC,
sUnknown_80E6104,TRUE,0,FALSE);
sub_801CCD8();
sub_8035CF4(sTradeItemsMenu->unk44,3,TRUE);
@@ -626,11 +626,11 @@ void sub_8036ECC(u32 index, u32 r1)
sTradeItemsMenu->unk14.unk1C = 0x2c;
sTradeItemsMenu->unk14.unk20 = 0x12;
sTradeItemsMenu->unk14.unk14 = index;
sTradeItemsMenu->unk14.unk18 = &sTradeItemsMenu->unk184[index];
sTradeItemsMenu->unk14.unk18 = &sTradeItemsMenu->unk184.a0[index];
sub_8013AA0(&sTradeItemsMenu->unk14);
sTradeItemsMenu->unk184[index] = sUnknown_80E6174;
sTradeItemsMenu->unk184.a0[index] = sUnknown_80E6174;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sTradeItemsMenu->unk184, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sTradeItemsMenu->unk184, TRUE, TRUE);
}
void sub_8036F30(void)
@@ -647,7 +647,7 @@ void sub_8036F30(void)
void sub_8036F74(void)
{
RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk184);
RestoreUnkTextStruct_8006518(&sTradeItemsMenu->unk184);
sub_8036ECC(2, gTeamInventoryRef->teamStorage[sTradeItemsMenu->itemToSend.id]);
sub_801CCD8();
sub_8035CF4(sTradeItemsMenu->unk44, 3, FALSE);
src/unk_menu_203B360.c
+4 -4
View File
@@ -15,7 +15,7 @@ typedef struct unkStruct_203B360
/* 0x0 */ u32 currMenu;
u32 unk4; // state
MenuStruct unk8[4];
UnkTextStruct2 unk148[4];
UnkTextStruct3 unk148;
SpriteOAM unk1A8;
u32 unk1B0; // sprite count?
} unkStruct_203B360;
@@ -68,15 +68,15 @@ void sub_80382E4(s32 currMenu)
MemoryFill8(sUnknown_203B360, 0, sizeof(unkStruct_203B360));
}
for(index = 0; index < 4; index++){
sUnknown_203B360->unk148[index] = gUnknown_80E6E7C;
sUnknown_203B360->unk148.a0[index] = gUnknown_80E6E7C;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B360->unk148, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B360->unk148, TRUE, TRUE);
if (currMenu == 0x25) {
// Caution!
// The storage space is empty!
// Please check again.
SetMenuItems(sUnknown_203B360->unk8,sUnknown_203B360->unk148,0,&gUnknown_80E6E94,gUnknown_80E6EAC,
SetMenuItems(sUnknown_203B360->unk8,&sUnknown_203B360->unk148,0,&gUnknown_80E6E94,gUnknown_80E6EAC,
FALSE,4,FALSE);
}
sub_8035CF4(sUnknown_203B360->unk8,0,TRUE);
src/wigglytuff_shop1.c
+8 -8
View File
@@ -30,12 +30,12 @@ bool8 sub_80211AC(u32 mode, u32 a1)
sWigglytuffShop1Work = MemoryAlloc(sizeof(WigglytuffShop1Work), 8);
sWigglytuffShop1Work->mode = mode;
sWigglytuffShop1Work->s40.s0.unk34 = a1;
sWigglytuffShop1Work->s40.s0.unk38 = &sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34];
RestoreUnkTextStruct_8006518(sWigglytuffShop1Work->s40.s0.unk3C);
sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC47C;
sWigglytuffShop1Work->s40.s0.unk38 = &sWigglytuffShop1Work->s40.s0.unk3C.a0[sWigglytuffShop1Work->s40.s0.unk34];
RestoreUnkTextStruct_8006518(&sWigglytuffShop1Work->s40.s0.unk3C);
sWigglytuffShop1Work->s40.s0.unk3C.a0[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC47C;
sWigglytuffShop1Work->s40.s0.unk38->unk14 = &sWigglytuffShop1Work->s40.unk9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
sub_8013818(&sWigglytuffShop1Work->s40.s0.input, sub_8021664(), 10, a1);
if (sUnknown_203B284 == sWigglytuffShop1Work->mode) {
@@ -87,7 +87,7 @@ u8 sub_802132C(void)
void sub_8021354(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop1Work->s40.s0.unk3C, FALSE, FALSE);
sWigglytuffShop1Work->s40.s0.input.unk22 = sub_8021664();
sub_8013984(&sWigglytuffShop1Work->s40.s0.input);
sub_8021410();
@@ -103,9 +103,9 @@ void sub_80213A0(void)
sUnknown_203B284 = sWigglytuffShop1Work->mode;
sUnknown_203B288 = sWigglytuffShop1Work->s40.s0.input.menuIndex;
sUnknown_203B28A = sWigglytuffShop1Work->s40.s0.input.unk1E;
sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC464;
sWigglytuffShop1Work->s40.s0.unk3C.a0[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC464;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
MemoryFree(sWigglytuffShop1Work);
sWigglytuffShop1Work = NULL;
}
@@ -118,7 +118,7 @@ static void sub_8021410(void)
sWigglytuffShop1Work->s40.unk9C.f2 = 12;
sWigglytuffShop1Work->s40.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE);
SUB_80095E4_CALL(sWigglytuffShop1Work->s40.s0);
}
src/wigglytuff_shop2.c
+6 -6
View File
@@ -31,9 +31,9 @@ bool8 CreateWigglytuffShopFriendAreaMenu(u8 friendArea, bool8 a1, s32 a2)
sub_801317C(&sWigglytuffShop2Work->unk0);
sub_8021A60();
sWigglytuffShop2Work->unk74 = a2;
sWigglytuffShop2Work->unk78 = &sWigglytuffShop2Work->unk7C[a2];
RestoreUnkTextStruct_8006518(sWigglytuffShop2Work->unk7C);
sWigglytuffShop2Work->unk7C[sWigglytuffShop2Work->unk74] = sUnknown_80DC4D8;
sWigglytuffShop2Work->unk78 = &sWigglytuffShop2Work->unk7C.a0[a2];
RestoreUnkTextStruct_8006518(&sWigglytuffShop2Work->unk7C);
sWigglytuffShop2Work->unk7C.a0[sWigglytuffShop2Work->unk74] = sUnknown_80DC4D8;
sub_8021820();
return TRUE;
}
@@ -61,9 +61,9 @@ static void sub_8021820(void)
void CleanWigglytuffShopFriendAreaInfoMenu(void)
{
if (sWigglytuffShop2Work) {
sWigglytuffShop2Work->unk7C[sWigglytuffShop2Work->unk74] = sUnknown_80DC4BC;
sWigglytuffShop2Work->unk7C.a0[sWigglytuffShop2Work->unk74] = sUnknown_80DC4BC;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop2Work->unk7C, TRUE, TRUE);
MemoryFree(sWigglytuffShop2Work);
sWigglytuffShop2Work = NULL;
}
@@ -72,7 +72,7 @@ void CleanWigglytuffShopFriendAreaInfoMenu(void)
static void sub_8021878(void)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop2Work->unk7C, TRUE, TRUE);
}
static void PopulateWigglytuffShopFriendAreaInfoScreen(void)
src/wigglytuff_shop3.c
+7 -7
View File
@@ -140,26 +140,26 @@ static void sub_8021D5C(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sWigglytuffShop3Work->unkD0);
RestoreUnkTextStruct_8006518(&sWigglytuffShop3Work->unkD0);
switch (sWigglytuffShop3Work->state) {
case WIGGLYTUFF_UNK9:
case WIGGLYTUFF_UNKA:
sWigglytuffShop3Work->unkD0[0] = sUnknown_80DC534;
sWigglytuffShop3Work->unkD0[2] = sUnknown_80DC534;
sWigglytuffShop3Work->unkD0[1] = sUnknown_80DC564;
sWigglytuffShop3Work->unkD0.a0[0] = sUnknown_80DC534;
sWigglytuffShop3Work->unkD0.a0[2] = sUnknown_80DC534;
sWigglytuffShop3Work->unkD0.a0[1] = sUnknown_80DC564;
break;
case WIGGLYTUFF_UNKB:
sWigglytuffShop3Work->unkD0[2] = sUnknown_80DC54C;
sWigglytuffShop3Work->unkD0.a0[2] = sUnknown_80DC54C;
break;
default:
for (i = 0; i < 4; i++)
sWigglytuffShop3Work->unkD0[i] = sUnknown_80DC534;
sWigglytuffShop3Work->unkD0.a0[i] = sUnknown_80DC534;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sWigglytuffShop3Work->unkD0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sWigglytuffShop3Work->unkD0, TRUE, TRUE);
}
static void UpdateWigglytuffDialogue(void)
src/wonder_mail.c
+20 -20
View File
@@ -420,7 +420,7 @@ void sub_8028348(void)
switch(sUnknown_203B2C0->state)
{
case 0x3B:
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8031D70(sUnknown_203B2C0->mailIndex, 0);
@@ -462,8 +462,8 @@ void sub_8028348(void)
}
break;
case 0x34:
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk35C);
SetMenuItems(sUnknown_203B2C0->unk21C, sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDAE4, gUnknown_80DDAFC, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk35C);
SetMenuItems(sUnknown_203B2C0->unk21C, &sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDAE4, gUnknown_80DDAFC, TRUE, 0, FALSE);
sub_8023DA4();
sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE);
break;
@@ -572,7 +572,7 @@ void sub_8028348(void)
CreateDialogueBoxAndPortrait(gUnknown_80DE124, 0, &sUnknown_203B2C0->monPortrait,0x10d);
break;
case 0x27:
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, sUnknown_203B2C0->passwordBuffer);
@@ -617,8 +617,8 @@ void sub_8028348(void)
break;
case 0x20:
case 0x2B:
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk35C);
SetMenuItems(sUnknown_203B2C0->unk21C, sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDACC, gUnknown_80DDAFC, TRUE, 0, FALSE);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk35C);
SetMenuItems(sUnknown_203B2C0->unk21C, &sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDACC, gUnknown_80DDAFC, TRUE, 0, FALSE);
sub_803092C();
sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE);
break;
@@ -1114,7 +1114,7 @@ void sub_8029044(void)
case 4:
sUnknown_203B2C0->fallbackState = 0x1F;
sUnknown_203B2C0->mailIndex = sub_80307EC();
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C0->mailIndex, 0);
@@ -1150,7 +1150,7 @@ void sub_80290F0(void)
break;
case INFO_ACTION:
sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C0->mailIndex, 0);
@@ -1158,7 +1158,7 @@ void sub_80290F0(void)
break;
case 4:
case CANCEL_ACTION:
sub_8035CC0(sUnknown_203B2C0->unk35C, 2);
sub_8035CC0(&sUnknown_203B2C0->unk35C, 2);
sub_8030810(1);
SetFriendRescueCounterState(0x1F);
break;
@@ -1175,7 +1175,7 @@ void sub_80291AC(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_803092C();
if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@@ -1392,7 +1392,7 @@ void sub_80293F4(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C0->unk3BC, TRUE, TRUE);
SetFriendRescueCounterState(FRIEND_RESCUE_MAIN);
break;
default:
@@ -1463,7 +1463,7 @@ void sub_80295D8(void)
case 4:
sUnknown_203B2C0->fallbackState = 0x2A;
sUnknown_203B2C0->mailIndex = sub_80307EC();
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C0->mailIndex, 0);
@@ -1499,7 +1499,7 @@ void sub_8029684(void)
break;
case INFO_ACTION:
sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8030D40(sUnknown_203B2C0->mailIndex, 0);
@@ -1507,7 +1507,7 @@ void sub_8029684(void)
break;
case 0x4:
case CANCEL_ACTION:
sub_8035CC0(sUnknown_203B2C0->unk35C,2);
sub_8035CC0(&sUnknown_203B2C0->unk35C,2);
sub_8030810(1);
SetFriendRescueCounterState(0x2A);
break;
@@ -1522,7 +1522,7 @@ void sub_8029740(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_803092C();
if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@@ -1573,7 +1573,7 @@ void sub_80297D4(void)
case 4:
sUnknown_203B2C0->fallbackState = SELECT_HELPER_POKEMON;
sUnknown_203B2C0->speciesNum = sub_8023B44();
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8024458(sUnknown_203B2C0->speciesNum, 0);
@@ -1599,7 +1599,7 @@ void sub_8029884(void)
break;
case INFO_ACTION:
sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC);
RestoreUnkTextStruct_8006518(&sUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_8024458(sUnknown_203B2C0->speciesNum, 0);
@@ -1607,7 +1607,7 @@ void sub_8029884(void)
break;
case 0x4:
case CANCEL_ACTION:
sub_8035CC0(sUnknown_203B2C0->unk35C, 3);
sub_8035CC0(&sUnknown_203B2C0->unk35C, 3);
sub_8023B7C(1);
SetFriendRescueCounterState(SELECT_HELPER_POKEMON);
break;
@@ -1631,7 +1631,7 @@ void sub_8029944(void)
case 3:
sub_802453C();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_8023B7C(1);
if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@@ -1771,7 +1771,7 @@ void sub_8029AF4(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2C0->unk3BC, TRUE, TRUE);
SetFriendRescueCounterState(0x3C);
break;
case 1:
src/wonder_mail_3_mid.c
+6 -6
View File
@@ -19,7 +19,7 @@ struct unkStruct_203B30C
unkStruct_802C39C unk8;
MenuStruct unk60;
MenuItem unkB0[8];
UnkTextStruct2 unkF0[4];
UnkTextStruct3 unkF0;
};
static EWRAM_INIT struct unkStruct_203B30C *gUnknown_203B30C = {NULL};
@@ -119,22 +119,22 @@ void sub_802F004(void)
{
s32 index;
RestoreUnkTextStruct_8006518(gUnknown_203B30C->unkF0);
RestoreUnkTextStruct_8006518(&gUnknown_203B30C->unkF0);
switch(gUnknown_203B30C->state)
{
case 2:
sub_802F108();
gUnknown_203B30C->unkF0[2] = gUnknown_80E03F4;
sub_8012CAC(&gUnknown_203B30C->unkF0[2], gUnknown_203B30C->unkB0);
gUnknown_203B30C->unkF0.a0[2] = gUnknown_80E03F4;
sub_8012CAC(&gUnknown_203B30C->unkF0.a0[2], gUnknown_203B30C->unkB0);
break;
default:
for(index = 0; index < 4; index++)
{
gUnknown_203B30C->unkF0[index] = gUnknown_80E03C4;
gUnknown_203B30C->unkF0.a0[index] = gUnknown_80E03C4;
}
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B30C->unkF0, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B30C->unkF0, TRUE, TRUE);
}
void sub_802F088(void)
src/wonder_mail_4.c
+9 -9
View File
@@ -77,7 +77,7 @@ ALIGNED(4) const u8 SOSList[] = "SOS List";
s32 sub_8030A74(void);
void sub_80308A0(void);
u32 sub_80306A8(u32 wonderMailType, u32 r1, UnkTextStruct2_sub *r2, u32 r3)
u32 sub_80306A8(u32 wonderMailType, u32 r1, DungeonPos *r2, u32 r3)
{
if (HasNoWonderMailType(wonderMailType))
return 0;
@@ -86,18 +86,18 @@ u32 sub_80306A8(u32 wonderMailType, u32 r1, UnkTextStruct2_sub *r2, u32 r3)
gUnknown_203B320->wonderMailType = wonderMailType;
gUnknown_203B320->s28.s0.unk34 = r1;
gUnknown_203B320->s28.s0.unk38 = &gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34];
RestoreUnkTextStruct_8006518(gUnknown_203B320->s28.s0.unk3C);
gUnknown_203B320->s28.s0.unk38 = &gUnknown_203B320->s28.s0.unk3C.a0[gUnknown_203B320->s28.s0.unk34];
RestoreUnkTextStruct_8006518(&gUnknown_203B320->s28.s0.unk3C);
gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E0854;
gUnknown_203B320->s28.s0.unk3C.a0[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E0854;
gUnknown_203B320->s28.s0.unk38->unk14 = &gUnknown_203B320->s28.unk9C;
if (r2 != 0)
gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34].unk8 = *r2;
gUnknown_203B320->s28.s0.unk3C.a0[gUnknown_203B320->s28.s0.unk34].pos = *r2;
sub_8012D08(gUnknown_203B320->s28.s0.unk38, r3);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B320->s28.s0.input, sub_8030A74(), r3, r1);
sub_80308A0();
sub_803092C();
@@ -154,9 +154,9 @@ void sub_803084C(void)
{
if(gUnknown_203B320 != NULL)
{
gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E083C;
gUnknown_203B320->s28.s0.unk3C.a0[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E083C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B320);
gUnknown_203B320 = NULL;
}
@@ -174,7 +174,7 @@ void sub_80308A0(void)
gUnknown_203B320->s28.unk9C.f2 = 12;
gUnknown_203B320->s28.unk9C.f3 = 0;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE);
SUB_80095E4_CALL(gUnknown_203B320->s28.s0);
}
src/wonder_mail_5.c
+7 -7
View File
@@ -21,7 +21,7 @@ struct unkStruct_203B324
u8 mailIndex;
u32 windowID;
UnkTextStruct2 *unk14;
UnkTextStruct2 unk18[4];
UnkTextStruct3 unk18;
};
static EWRAM_INIT struct unkStruct_203B324 *gUnknown_203B324 = {NULL};
@@ -63,9 +63,9 @@ bool8 sub_8030D40(u8 mailIndex, s32 windowID)
gUnknown_203B324->mailIndex = mailIndex;
sub_801317C(&gUnknown_203B324->unk0);
gUnknown_203B324->windowID = windowID;
gUnknown_203B324->unk14 = &gUnknown_203B324->unk18[windowID];
RestoreUnkTextStruct_8006518(gUnknown_203B324->unk18);
gUnknown_203B324->unk18[gUnknown_203B324->windowID] = gUnknown_80E091C;
gUnknown_203B324->unk14 = &gUnknown_203B324->unk18.a0[windowID];
RestoreUnkTextStruct_8006518(&gUnknown_203B324->unk18);
gUnknown_203B324->unk18.a0[gUnknown_203B324->windowID] = gUnknown_80E091C;
sub_8030DD4();
return TRUE;
}
@@ -95,9 +95,9 @@ void sub_8030DE4(void)
{
if(gUnknown_203B324 != NULL)
{
gUnknown_203B324->unk18[gUnknown_203B324->windowID] = gUnknown_80E0900;
gUnknown_203B324->unk18.a0[gUnknown_203B324->windowID] = gUnknown_80E0900;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B324->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B324->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B324);
gUnknown_203B324 = NULL;
}
@@ -106,7 +106,7 @@ void sub_8030DE4(void)
void sub_8030E2C(void)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B324->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B324->unk18, TRUE, TRUE);
}
void sub_8030E48(void)
src/wonder_mail_6.c
+16 -16
View File
@@ -17,7 +17,7 @@ struct unkStruct_203B328
u8 mailIndex;
MenuStruct unk8;
MenuStruct unk58;
UnkTextStruct2 unkA8[4];
UnkTextStruct3 unkA8;
/* 0x108 */ struct MonPortraitMsg monPortrait;
u32 wonderMailType;
};
@@ -180,30 +180,30 @@ void sub_80310E4(u32 newState)
static void sub_80310FC(void)
{
RestoreUnkTextStruct_8006518(gUnknown_203B328->unkA8);
RestoreUnkTextStruct_8006518(&gUnknown_203B328->unkA8);
switch(gUnknown_203B328->state)
{
case INIT_STATE:
gUnknown_203B328->unkA8[1] = gUnknown_80E0990;
gUnknown_203B328->unkA8[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8[3] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[1] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[3] = gUnknown_80E0990;
break;
case MAIN_MENU:
gUnknown_203B328->unkA8[1] = gUnknown_80E09A8;
gUnknown_203B328->unkA8[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8[3] = gUnknown_80E0990;
sub_8012CAC(&gUnknown_203B328->unkA8[1], gUnknown_80E0968);
gUnknown_203B328->unkA8.a0[1] = gUnknown_80E09A8;
gUnknown_203B328->unkA8.a0[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[3] = gUnknown_80E0990;
sub_8012CAC(&gUnknown_203B328->unkA8.a0[1], gUnknown_80E0968);
break;
case DELETE_SINGLE_MAIL_STATE:
case DELETE_ALL_MAIL_STATE:
gUnknown_203B328->unkA8[2] = gUnknown_80E09C0;
sub_8012CAC(&gUnknown_203B328->unkA8[2], gUnknown_80E0948);
gUnknown_203B328->unkA8.a0[2] = gUnknown_80E09C0;
sub_8012CAC(&gUnknown_203B328->unkA8.a0[2], gUnknown_80E0948);
break;
case INFO_STATE:
gUnknown_203B328->unkA8[0] = gUnknown_80E0990;
gUnknown_203B328->unkA8[1] = gUnknown_80E0990;
gUnknown_203B328->unkA8[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8[3] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[0] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[1] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[2] = gUnknown_80E0990;
gUnknown_203B328->unkA8.a0[3] = gUnknown_80E0990;
break;
case 5:
case 6:
@@ -213,7 +213,7 @@ static void sub_80310FC(void)
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B328->unkA8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B328->unkA8, TRUE, TRUE);
}
static void sub_8031258(void)
src/wonder_mail_802C10C.c
+9 -9
View File
@@ -20,7 +20,7 @@ static s32 CountPelipperBoardSlots(void);
static void sub_802C328(void);
bool8 sub_802C10C(s32 a0, UnkTextStruct2_sub *a1, s32 a2)
bool8 sub_802C10C(s32 a0, DungeonPos *a1, s32 a2)
{
if (HasNoPelipperBoardJobs())
return FALSE;
@@ -29,18 +29,18 @@ bool8 sub_802C10C(s32 a0, UnkTextStruct2_sub *a1, s32 a2)
gUnknown_203B2E0 = MemoryAlloc(sizeof(struct unkStruct_203B2E0), 8);
gUnknown_203B2E0->unk8.s0.unk34 = a0;
gUnknown_203B2E0->unk8.s0.unk38 = &gUnknown_203B2E0->unk8.s0.unk3C[a0];
RestoreUnkTextStruct_8006518(gUnknown_203B2E0->unk8.s0.unk3C);
gUnknown_203B2E0->unk8.s0.unk38 = &gUnknown_203B2E0->unk8.s0.unk3C.a0[a0];
RestoreUnkTextStruct_8006518(&gUnknown_203B2E0->unk8.s0.unk3C);
gUnknown_203B2E0->unk8.s0.unk3C[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFCB4;
gUnknown_203B2E0->unk8.s0.unk3C.a0[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFCB4;
gUnknown_203B2E0->unk8.s0.unk38->unk14 = &gUnknown_203B2E0->unk8.unk9C;
if (a1 != NULL)
gUnknown_203B2E0->unk8.s0.unk3C[gUnknown_203B2E0->unk8.s0.unk34].unk8 = *a1;
gUnknown_203B2E0->unk8.s0.unk3C.a0[gUnknown_203B2E0->unk8.s0.unk34].pos = *a1;
sub_8012D34(gUnknown_203B2E0->unk8.s0.unk38, a2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE);
sub_8013848(&gUnknown_203B2E0->unk8.s0.input, CountPelipperBoardSlots(), a2, a0);
gUnknown_203B2E0->unk8.s0.input.menuIndex = gUnknown_203B2E4;
sub_8013984(&gUnknown_203B2E0->unk8.s0.input);
@@ -84,7 +84,7 @@ u8 sub_802C26C(void)
void sub_802C28C(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E0->unk8.s0.unk3C, FALSE, FALSE);
gUnknown_203B2E0->unk8.s0.input.unk22 = CountPelipperBoardSlots();
sub_8013984(&gUnknown_203B2E0->unk8.s0.input);
sub_802C328();
@@ -98,9 +98,9 @@ void sub_802C2D4(void)
{
if (gUnknown_203B2E0 != NULL) {
gUnknown_203B2E4 = gUnknown_203B2E0->unk8.s0.input.menuIndex;
gUnknown_203B2E0->unk8.s0.unk3C[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFC9C;
gUnknown_203B2E0->unk8.s0.unk3C.a0[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFC9C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B2E0);
gUnknown_203B2E0 = NULL;
}
src/wonder_mail_802C4C8.c
+9 -9
View File
@@ -23,25 +23,25 @@ static s32 CountAcceptedJobs(void);
static void sub_802C6DC(void);
bool8 sub_802C4C8(s32 a0, UnkTextStruct2_sub *a1, u32 a2)
bool8 sub_802C4C8(s32 a0, DungeonPos *a1, u32 a2)
{
if (HasNoAcceptedJobs())
return FALSE;
gUnknown_203B2E8 = MemoryAlloc(sizeof(struct unkStruct_203B2E0), 8);
gUnknown_203B2E8->unk8.s0.unk34 = a0;
gUnknown_203B2E8->unk8.s0.unk38 = &gUnknown_203B2E8->unk8.s0.unk3C[a0];
RestoreUnkTextStruct_8006518(gUnknown_203B2E8->unk8.s0.unk3C);
gUnknown_203B2E8->unk8.s0.unk38 = &gUnknown_203B2E8->unk8.s0.unk3C.a0[a0];
RestoreUnkTextStruct_8006518(&gUnknown_203B2E8->unk8.s0.unk3C);
gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCFC;
gUnknown_203B2E8->unk8.s0.unk3C.a0[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCFC;
gUnknown_203B2E8->unk8.s0.unk38->unk14 = &gUnknown_203B2E8->unk8.unk9C;
if (a1 != NULL)
gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34].unk8 = *a1;
gUnknown_203B2E8->unk8.s0.unk3C.a0[gUnknown_203B2E8->unk8.s0.unk34].pos = *a1;
sub_8012D34(gUnknown_203B2E8->unk8.s0.unk38, a2);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
sub_8013848(&gUnknown_203B2E8->unk8.s0.input, CountAcceptedJobs(), a2, a0);
gUnknown_203B2E8->unk8.s0.input.menuIndex = gUnknown_203B2EC;
sub_8013984(&gUnknown_203B2E8->unk8.s0.input);
@@ -85,7 +85,7 @@ u8 GetPelipperBoardSlotIndex(void)
void sub_802C640(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E8->unk8.s0.unk3C, FALSE, FALSE);
gUnknown_203B2E8->unk8.s0.input.unk22 = CountAcceptedJobs();
sub_8013984(&gUnknown_203B2E8->unk8.s0.input);
sub_802C6DC();
@@ -99,9 +99,9 @@ void sub_802C688(void)
{
if (gUnknown_203B2E8 != NULL) {
gUnknown_203B2EC = gUnknown_203B2E8->unk8.s0.input.menuIndex;
gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCE4;
gUnknown_203B2E8->unk8.s0.unk3C.a0[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCE4;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B2E8);
gUnknown_203B2E8 = NULL;
}
src/wonder_mail_802C860.c
+6 -6
View File
@@ -82,25 +82,25 @@ static void sub_802C928(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B2F0->unk19C);
RestoreUnkTextStruct_8006518(&sUnknown_203B2F0->unk19C);
switch (sUnknown_203B2F0->state) {
case 2:
sub_802CAA4();
sUnknown_203B2F0->unk19C[2] = sUnknown_80DFD40;
sub_8012CAC(&sUnknown_203B2F0->unk19C[2], sUnknown_203B2F0->unk10C);
sUnknown_203B2F0->unk19C.a0[2] = sUnknown_80DFD40;
sub_8012CAC(&sUnknown_203B2F0->unk19C.a0[2], sUnknown_203B2F0->unk10C);
break;
case 3:
sUnknown_203B2F0->unk19C[3] = sUnknown_80DFD58;
sUnknown_203B2F0->unk19C.a0[3] = sUnknown_80DFD58;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B2F0->unk19C[i] = sUnknown_80DFD28;
sUnknown_203B2F0->unk19C.a0[i] = sUnknown_80DFD28;
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F0->unk19C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2F0->unk19C, TRUE, TRUE);
}
static void sub_802C9D8(void)
src/wonder_mail_802CDD4.c
+7 -7
View File
@@ -25,13 +25,13 @@ bool8 sub_802CDD4(u32 a0)
sUnknown_203B2F4 = MemoryAlloc(sizeof(struct_Sub80095E4_2), 8);
sUnknown_203B2F4->s0.unk34 = a0;
sUnknown_203B2F4->s0.unk38 = &sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34];
RestoreUnkTextStruct_8006518(sUnknown_203B2F4->s0.unk3C);
sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFDA4;
sUnknown_203B2F4->s0.unk38 = &sUnknown_203B2F4->s0.unk3C.a0[sUnknown_203B2F4->s0.unk34];
RestoreUnkTextStruct_8006518(&sUnknown_203B2F4->s0.unk3C);
sUnknown_203B2F4->s0.unk3C.a0[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFDA4;
sUnknown_203B2F4->s0.unk38->unk14 = &sUnknown_203B2F4->unk9C;
sub_8012D34(sUnknown_203B2F4->s0.unk38, 4);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2F4->s0.unk3C, TRUE, TRUE);
sub_8013848(&sUnknown_203B2F4->s0.input, 5, 4, a0);
sub_802CF5C();
sub_802CFD0();
@@ -69,7 +69,7 @@ u8 sub_802CEBC(void)
void sub_802CED8(bool8 cursorSprite)
{
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2F4->s0.unk3C, FALSE, FALSE);
sub_8013984(&sUnknown_203B2F4->s0.input);
sub_802CF5C();
sub_802CFD0();
@@ -81,9 +81,9 @@ void sub_802CED8(bool8 cursorSprite)
void sub_802CF14(void)
{
if (sUnknown_203B2F4 != NULL) {
sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFD8C;
sUnknown_203B2F4->s0.unk3C.a0[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFD8C;
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2F4->s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B2F4);
sUnknown_203B2F4 = NULL;
}
src/wonder_mail_802D098.c
+9 -9
View File
@@ -140,31 +140,31 @@ static void sub_802D1B8(void)
{
s32 i;
RestoreUnkTextStruct_8006518(sUnknown_203B2F8->unk1A8);
RestoreUnkTextStruct_8006518(&sUnknown_203B2F8->unk1A8);
switch (sUnknown_203B2F8->state) {
case 13:
sub_802D5A4();
sUnknown_203B2F8->unk1A8[2] = sUnknown_80DFE04;
sub_8012CAC(&sUnknown_203B2F8->unk1A8[2], sUnknown_203B2F8->unk118);
sUnknown_203B2F8->unk1A8[2].unkC = 6;
sUnknown_203B2F8->unk1A8.a0[2] = sUnknown_80DFE04;
sub_8012CAC(&sUnknown_203B2F8->unk1A8.a0[2], sUnknown_203B2F8->unk118);
sUnknown_203B2F8->unk1A8.a0[2].unkC = 6;
break;
case 14:
sub_802D63C();
sUnknown_203B2F8->unk1A8[3] = sUnknown_80DFE1C;
sub_8012CAC(&sUnknown_203B2F8->unk1A8[3], sUnknown_203B2F8->unk158);
sUnknown_203B2F8->unk1A8[3].unkC = 6;
sUnknown_203B2F8->unk1A8.a0[3] = sUnknown_80DFE1C;
sub_8012CAC(&sUnknown_203B2F8->unk1A8.a0[3], sUnknown_203B2F8->unk158);
sUnknown_203B2F8->unk1A8.a0[3].unkC = 6;
break;
default:
for (i = 0; i < 4; i++)
sUnknown_203B2F8->unk1A8[i] = sUnknown_80DFDD4;
sUnknown_203B2F8->unk1A8.a0[i] = sUnknown_80DFDD4;
break;
case WONDER_MAIL_EXIT:
break;
}
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F8->unk1A8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&sUnknown_203B2F8->unk1A8, TRUE, TRUE);
}
static void sub_802D2A8(void)
src/wonder_mail_main_menu.c
+4 -4
View File
@@ -49,7 +49,7 @@ struct unkStruct_203B3E8
u8 unk38_u8[0x30]; // idk why it fills to 0x30 instead...
} UNK38;
u8 fill68[0x1EC - 0x68];
UnkTextStruct2 unk1EC[4];
UnkTextStruct3 unk1EC;
u32 unk24C;
/* 0x250 */ u32 wonderMailStatus;
unkStruct_803B344 unk254;
@@ -331,7 +331,7 @@ void HandlePasswordEntryScreen(void)
case 3:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B3E8->unk1EC, TRUE, TRUE);
if ( !DecodeWonderMailPassword(gUnknown_203B3E8->PasswordEntryBuffer, &gUnknown_203B3E8->UNK38.decodedMail) || !IsValidWonderMail(&gUnknown_203B3E8->UNK38.decodedMail) )
{
// Invalid password
@@ -349,7 +349,7 @@ void HandlePasswordEntryScreen(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(&gUnknown_203B3E8->unk1EC, TRUE, TRUE);
SetWonderMailMainMenuState(EXIT_TO_MAIN_MENU);
break;
}
@@ -558,7 +558,7 @@ void WonderMailMainMenuCallback(void)
CreateDialogueBoxAndPortrait(gUnknown_80E7C98,0,0,0x101);
break;
case PASSWORD_ENTRY_SCREEN:
RestoreUnkTextStruct_8006518(gUnknown_203B3E8->unk1EC);
RestoreUnkTextStruct_8006518(&gUnknown_203B3E8->unk1EC);
ResetUnusedInputStruct();
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sub_80151C0(5,gUnknown_203B3E8->PasswordEntryBuffer);