Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 15:46:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Some] NULL and bool8 params

Browse Source
This commit is contained in:
Kermalis 2023-08-31 23:23:16 -04:00
parent af3b331b2b
commit 90a8c0dda6
62 changed files with 266 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/code_800558C.h
View File

@ -23,6 +23,7 @@ void nullsub_14(void);
void sub_8005610(struct OpenedFile *, s32, s32, u8 *);
void sub_8005770(s32, u8 *, s32, u8 *);
void sub_80057E8(void);
void sub_8005838(s32 *, u8);
void sub_80060EC(void);
#endif // GUARD_CODE_800558C_H

2
include/text1.h
View File

@ -12,6 +12,6 @@ void LoadCharmaps(void);
void SelectCharmap(u32);
u32 xxx_update_some_bg_tiles(u32 a0);
void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2);
void sub_800641C(struct UnkTextStruct2 *a0, bool8 a1, bool8 a2);
#endif // GUARD_TEXT1_H

6
src/adventure_log.c
View File

@ -64,7 +64,7 @@ u32 CreateAdventureLogScreen(u32 param_1)
gAdventureLog->unk38->unk14 = gAdventureLog->unk9C;
ResetUnusedInputStruct();
sub_800641C(gAdventureLog->unk3C,1,1);
sub_800641C(gAdventureLog->unk3C, TRUE, TRUE);
sub_8013818(&gAdventureLog->input,0x20,8,param_1);
sub_8032084();
DisplayAdventureLog();
@ -104,7 +104,7 @@ void CleanAdventureLogScreen(void)
if (gAdventureLog != NULL) {
gAdventureLog->unk3C[gAdventureLog->unk34] = gUnknown_80E1FF0;
ResetUnusedInputStruct();
sub_800641C(gAdventureLog->unk3C,1,1);
sub_800641C(gAdventureLog->unk3C, TRUE, TRUE);
MemoryFree(gAdventureLog);
gAdventureLog = 0;
}
@ -128,7 +128,7 @@ void sub_8032084(void)
// Good past here except regs for this store
gAdventureLog->unk3C[gAdventureLog->unk34].unk10 = sVar2 + 2;
ResetUnusedInputStruct();
sub_800641C(gAdventureLog->unk3C,1,1);
sub_800641C(gAdventureLog->unk3C, TRUE, TRUE);
}
#else
NAKED

2
src/adventure_log_menu.c
View File

@ -16,7 +16,7 @@ void CreateAdventureLogMenu(void)
void CleanAdventureLogMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
}
u32 UpdateAdventureLogMenu(void)

6
src/code_2.c
View File

@ -22,6 +22,7 @@
#include "sprite.h"
#include "code_80118A4.h"
#include "bg_palette_buffer.h"
#include "code_800558C.h"
extern void NDS_LoadOverlay_GroundMain(void);
extern void sub_8014144(void);
@ -44,7 +45,6 @@ extern void nullsub_33(void);
extern u32 sub_80009D0(u32);
extern void xxx_draw_string_80144C4(void);
extern void sub_8005838(u32, u32);
extern void nullsub_8(u32);
extern void sub_80060EC(void);
extern void sub_800CB20(void);
@ -110,7 +110,7 @@ void GameLoop(void)
xxx_update_some_bg_tiles(0);
sub_80097B0();
sub_800CDA8(2);
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_2026E4E = 0x1000;
LoadTitleScreen();
SetBG2RegOffsets(0, 0);
@ -192,7 +192,7 @@ void GameLoop(void)
void xxx_update_stuff(u32 r0)
{
xxx_draw_string_80144C4();
sub_8005838(0, 0);
sub_8005838(NULL, 0);
nullsub_8(gGameOptionsRef->unkA);
sub_8005180();
sub_80060EC();

3
src/code_80118A4.c
View File

@ -36,7 +36,6 @@ EWRAM_DATA s16 gUnknown_202DE22;
EWRAM_DATA s16 gUnknown_202DE24;
void nullsub_8(u32);
void sub_8005838(u32, u32);
extern void TransferBGPaletteBuffer(void);
extern void xxx_call_update_bg_vram(void);
extern void sub_8009908(void);
@ -51,7 +50,7 @@ void sub_801169C(void)
SetBG3RegOffsets(gUnknown_203B0E4->xoffset, gUnknown_203B0E4->yoffset);
sub_8010F28();
sub_8004AF0(sub_80111C4(), gUnknown_203B0E4->unk4C4C, 0xB0, 16, gUnknown_203B0E4->unk4DCC, NULL);
sub_8005838(0, 0);
sub_8005838(NULL, 0);
nullsub_8(gGameOptionsRef->unkA);
sub_8005180();
sub_80060EC();

2
src/code_8012A18_1.c
View File

@ -79,7 +79,7 @@ s32 sub_8016028(void)
u32 sub_801602C(u32 r0, u8 *name)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B200 = MemoryAlloc(sizeof(struct unkStruct_203B200), 8);
gUnknown_203B200->unk0 = r0;
gUnknown_203B200->pokeName = name;

8
src/code_801B3C0.c
View File

@ -101,7 +101,7 @@ u32 sub_801B3C0(struct Item *item)
gUnknown_203B230->unk24 = 0;
sub_80140B4(gUnknown_203B230->unk28);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B230->unk28,1,1);
sub_800641C(gUnknown_203B230->unk28, TRUE, TRUE);
sub_801B46C(0);
return 1;
}
@ -320,7 +320,7 @@ void sub_801B760(void)
gUnknown_203B234->unkF4[index] = gUnknown_80DBA58;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B234->unkF4, 1, 1);
sub_800641C(gUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 10:
sub_8006518(gUnknown_203B234->unkF4);
@ -328,13 +328,13 @@ void sub_801B760(void)
gUnknown_203B234->unkF4[2] = gUnknown_80DBA70;
sub_8012CAC(&gUnknown_203B234->unkF4[2], gUnknown_203B234->unkCC);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B234->unkF4, 1, 1);
sub_800641C(gUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 12:
sub_8006518(gUnknown_203B234->unkF4);
gUnknown_203B234->unkF4[1] = gUnknown_80DBA88;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B234->unkF4, 1, 1);
sub_800641C(gUnknown_203B234->unkF4, TRUE, TRUE);
break;
}
}

26
src/code_801C620.c
View File

@ -259,7 +259,7 @@ void sub_801BFCC(void)
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B238->unkC4, 1, 1);
sub_800641C(gUnknown_203B238->unkC4, TRUE, TRUE);
}
void sub_801C03C(void)
@ -403,7 +403,7 @@ bool8 sub_801C244(s16 species, u32 index, u32 param_3)
gUnknown_203B23C->unk5C->unk14 = &gUnknown_203B23C->unkC0;
sub_8012D08(gUnknown_203B23C->unk5C,param_3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B23C->unk60,1,1);
sub_800641C(gUnknown_203B23C->unk60, TRUE, TRUE);
sub_8013818(&gUnknown_203B23C->input,gUnknown_203B23C->numIQSkills,param_3,index);
sub_801C440();
sub_801C4C8();
@ -449,7 +449,7 @@ s32 sub_801C390(void)
void sub_801C3B0(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B23C->unk60, 0, 0);
sub_800641C(gUnknown_203B23C->unk60, FALSE, FALSE);
gUnknown_203B23C->input.unk22 = gUnknown_203B23C->numIQSkills;
sub_8013984(&gUnknown_203B23C->input);
sub_801C440();
@ -464,7 +464,7 @@ void sub_801C3F8(void)
{
gUnknown_203B23C->unk60[gUnknown_203B23C->unk58] = gUnknown_80DBDD8;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B23C->unk60, 1, 1);
sub_800641C(gUnknown_203B23C->unk60, TRUE, TRUE);
MemoryFree(gUnknown_203B23C);
gUnknown_203B23C = NULL;
}
@ -481,12 +481,12 @@ void sub_801C440(void)
gUnknown_203B23C->unkC2 = 0xA;
gUnknown_203B23C->unkC3 = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B23C->unk60, 1, 1);
sub_800641C(gUnknown_203B23C->unk60, TRUE, TRUE);
sVar2 = sub_80095E4(gUnknown_203B23C->unk24.unk1A, 0xc) + 2;
gUnknown_203B23C->unk60[gUnknown_203B23C->unk58].unkE = sVar2;
gUnknown_203B23C->unk60[gUnknown_203B23C->unk58].unk10 = sVar2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B23C->unk60, 1, 1);
sub_800641C(gUnknown_203B23C->unk60, TRUE, TRUE);
}
#else
NAKED
@ -618,7 +618,7 @@ u32 sub_801C620(u8 iqSkill)
gUnknown_203B240->unk24 = 0;
sub_80140B4(gUnknown_203B240->unk28);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B240->unk28,1,1);
sub_800641C(gUnknown_203B240->unk28, TRUE, TRUE);
sub_801C6D0(0);
return 1;
}
@ -768,7 +768,7 @@ bool8 sub_801C8C4(s32 param_1, s32 param_2, struct UnkTextStruct2_sub *param_3,
sub_8012D08(gUnknown_203B244->unk4EC, param_4);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B244->unk4F0,1,1);
sub_800641C(gUnknown_203B244->unk4F0, TRUE, TRUE);
sub_8013818(&gUnknown_203B244->input, sub_801CE58(), param_4, param_2);
if (gUnknown_203B248 == gUnknown_203B244->unk0) {
gUnknown_203B244->input.menuIndex = gUnknown_203B24C;
@ -838,7 +838,7 @@ u8 sub_801CB24(void) {
void sub_801CB5C(bool8 r0) {
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B244->unk4F0, 0, 0);
sub_800641C(gUnknown_203B244->unk4F0, FALSE, FALSE);
gUnknown_203B244->input.unk22 = sub_801CE58();
sub_8013984(&gUnknown_203B244->input);
sub_801CC38();
@ -857,7 +857,7 @@ void sub_801CBB8(void) {
gUnknown_203B24E = gUnknown_203B244->input.unk1E;
gUnknown_203B244->unk4F0[gUnknown_203B244->unk4E8] = gUnknown_80DBE3C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B244->unk4F0, 1, 1);
sub_800641C(gUnknown_203B244->unk4F0, TRUE, TRUE);
MemoryFree(gUnknown_203B244);
gUnknown_203B244 = NULL;
}
@ -1079,7 +1079,7 @@ bool8 sub_801D014(struct PokemonStruct *param_1)
struct unk_203B250 *preload;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B250 = MemoryAlloc(sizeof(struct unk_203B250), 8);
gUnknown_203B250->menuAction = gUnknown_203B254;
gUnknown_203B250->pokeStruct = param_1;
@ -1264,5 +1264,5 @@ void sub_801D220(void)
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B250->unkB8, 1, 1);
}
sub_800641C(gUnknown_203B250->unkB8, TRUE, TRUE);
}

4
src/code_801D760.c
View File

@ -538,7 +538,7 @@ u32 sub_801D9E4(void)
gUnknown_203B258->unk3C[gUnknown_203B258->unk34] = gUnknown_80DBF88;
gUnknown_203B258->unk38->unk14 = gUnknown_203B258->unk9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B258->unk3C,1,1);
sub_800641C(gUnknown_203B258->unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B258->input,0xe5,10,gUnknown_203B258->unk34);
sub_801DB54();
sub_801DBD4();
@ -597,7 +597,7 @@ void sub_801DB0C(void)
{
gUnknown_203B258->unk3C[gUnknown_203B258->unk34] = gUnknown_80DBF70;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B258->unk3C, 1, 1);
sub_800641C(gUnknown_203B258->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B258);
gUnknown_203B258 = NULL;
}

2
src/code_801EE10.c
View File

@ -59,7 +59,7 @@ u8 sub_801EE10(u32 param_1, s16 species, struct Move *moves, u32 param_4, u8 *te
}
sub_8012D08(&gUnknown_203B270->unk58[gUnknown_203B270->unk50],iVar8);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B270->unk58,1,1);
sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
sub_8013818(&gUnknown_203B270->input,iVar5,iVar5,param_6);
sub_8013780(&gUnknown_203B270->input,0);
sub_801F280(1);

4
src/code_801EE10_1.c
View File

@ -269,7 +269,7 @@ void sub_802453C(void)
{
gUnknown_203B2AC->unkE8[gUnknown_203B2AC->unkE0] = gUnknown_80DC9B0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2AC->unkE8, 1, 1);
sub_800641C(gUnknown_203B2AC->unkE8, TRUE, TRUE);
MemoryFree(gUnknown_203B2AC);
gUnknown_203B2AC = NULL;
}
@ -281,7 +281,7 @@ void sub_8024588(void)
gUnknown_203B2AC->unk148[1] = gUnknown_203B2AC->input.unk1E;
gUnknown_203B2AC->unk148[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2AC->unkE8,1,1);
sub_800641C(gUnknown_203B2AC->unkE8, TRUE, TRUE);
}
void sub_80245D0(void)

14
src/code_801EE10_mid.c
View File

@ -104,7 +104,7 @@ bool8 sub_801F428(s16 index, s32 param_2) {
gUnknown_203B274->unk3E4[2] = 0xC;
gUnknown_203B274->unk3E4[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->unk384, 1, 1);
sub_800641C(gUnknown_203B274->unk384, TRUE, TRUE);
sub_8013818(&gUnknown_203B274->input, sub_801F7E4(), 4, param_2);
sub_801F690();
sub_801F700();
@ -151,7 +151,7 @@ u16 sub_801F5B4(void)
void sub_801F5F0(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->unk384, 0, 0);
sub_800641C(gUnknown_203B274->unk384, FALSE, FALSE);
sub_8013984(&gUnknown_203B274->input);
sub_801F690();
sub_801F700();
@ -165,7 +165,7 @@ void sub_801F63C(void)
{
gUnknown_203B274->unk384[gUnknown_203B274->unk37C] = gUnknown_80DC2AC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->unk384, 1, 1);
sub_800641C(gUnknown_203B274->unk384, TRUE, TRUE);
MemoryFree(gUnknown_203B274);
gUnknown_203B274 = NULL;
}
@ -263,7 +263,7 @@ bool8 sub_801F808(u16 *moveIDs)
gUnknown_203B278->unk60 = gUnknown_203B278->unk64;
sub_80140B4(gUnknown_203B278->unk64);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64,1,1);
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
gUnknown_203B278->moveIDs = moveIDs;
for(index = 4; index > 1; index--)
@ -301,7 +301,7 @@ void sub_801F8D0(void)
{
gUnknown_203B278->unk64[gUnknown_203B278->unk5C] = gUnknown_80DC2F8;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, 1, 1);
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
MemoryFree(gUnknown_203B278);
gUnknown_203B278 = NULL;
}
@ -326,11 +326,11 @@ void sub_801F930(void)
gUnknown_203B278->unkC4[2] = 0x10;
gUnknown_203B278->unkC4[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, 1, 1);
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
break;
case 1:
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, 1, 1);
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
break;
default:
break;

6
src/code_8023144.c
View File

@ -303,7 +303,7 @@ bool8 sub_8023144(s32 param_1, s32 index, struct UnkTextStruct2_sub *sub, u32 pa
sub_8012D08(gUnknown_3001B5C->unk394,param_4);
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->unk398,1,1);
sub_800641C(gUnknown_3001B5C->unk398, TRUE, TRUE);
sub_8013818(&gUnknown_3001B5C->input,sub_80236A4(),param_4,index);
gUnknown_3001B5C->input.menuIndex = gUnknown_203B29C;
gUnknown_3001B5C->input.unk1E = gUnknown_203B29E;
@ -358,7 +358,7 @@ s16 sub_802331C(void)
void sub_8023354(u8 param_1)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->unk398,0,0);
sub_800641C(gUnknown_3001B5C->unk398, FALSE, FALSE);
sub_8013984(&gUnknown_3001B5C->input);
sub_8023420();
sub_80234BC();
@ -376,7 +376,7 @@ void sub_80233A0(void)
gUnknown_203B29E = gUnknown_3001B5C->input.unk1E;
gUnknown_3001B5C->unk398[gUnknown_3001B5C->unk390] = gUnknown_80DC904;
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->unk398,1,1);
sub_800641C(gUnknown_3001B5C->unk398, TRUE, TRUE);
MemoryFree(gUnknown_3001B5C);
gUnknown_3001B5C = NULL;
}

4
src/code_8023144_pre.c
View File

@ -36,7 +36,7 @@ extern struct UnkTextStruct2 gUnknown_80DC5BC;
bool8 sub_80227B8(struct PokemonStruct *pokeStruct)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B294 = MemoryAlloc(sizeof(struct unkStruct_203B294), 8);
gUnknown_203B294->menuAction = 0;
gUnknown_203B294->pokeStruct = pokeStruct;
@ -136,6 +136,6 @@ void sub_802293C(void) {
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B294->unk148, 1, 1);
sub_800641C(gUnknown_203B294->unk148, TRUE, TRUE);
}

4
src/code_8031D70.c
View File

@ -94,7 +94,7 @@ void sub_8031E10(void)
{
gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FA8;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B334->unk18, 1, 1);
sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B334);
gUnknown_203B334 = NULL;
}
@ -103,7 +103,7 @@ void sub_8031E10(void)
void sub_8031E58(void)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B334->unk18, 1, 1);
sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
}
void DrawSOSPasswordScreen(void)

4
src/credits.c
View File

@ -68,7 +68,7 @@ s32 DrawCredits(s32 creditsCategoryIndex, s32 param_2)
gUnknown_203B340->unk0[0] = gUnknown_80E4A28;
ResetUnusedInputStruct();
sub_800641C(&gUnknown_203B340->unk0[0], 1, 1);
sub_800641C(&gUnknown_203B340->unk0[0], TRUE, TRUE);
sub_8099690(2);
sub_80073B8(0);
@ -151,7 +151,7 @@ s32 sub_8035574(void)
case 3:
if (sub_8099B94() == 0) {
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B340->unk60 = 4;
}
break;

4
src/debug_menu1.c
View File

@ -70,14 +70,14 @@ void CreateDebugMenu(void)
sDebugMenu->unk140[i] = sUnknown_80E7D40;
ResetUnusedInputStruct();
sub_800641C(sDebugMenu->unk140, 1, 1);
sub_800641C(sDebugMenu->unk140, TRUE, TRUE);
SetDebugMenuItems();
}
void DeleteDebugMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
if (sDebugMenu != NULL) {
MemoryFree(sDebugMenu);
sDebugMenu = NULL;

4
src/debug_menu2.c
View File

@ -59,7 +59,7 @@ void sub_803A86C(void);
u32 sub_803A45C(void)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sUnknown_203B3F0 = MemoryAlloc(sizeof(struct unkStruct_203B3F0), 8);
sub_803A504(0);
return 1;
@ -124,7 +124,7 @@ void sub_803A51C(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B3F0->unkD8, 1, 1);
sub_800641C(sUnknown_203B3F0->unkD8, TRUE, TRUE);
}
void sub_803A5A0(void)

4
src/debug_menu3.c
View File

@ -51,7 +51,7 @@ bool8 sub_803ABC8(void);
u32 sub_803A888(void)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sUnknown_203B3F4 = MemoryAlloc(sizeof(struct unkStruct_203B3F4), 8);
sub_803A924(0);
return 1;
@ -107,7 +107,7 @@ void sub_803A93C(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B3F4->unk9C, 1, 1);
sub_800641C(sUnknown_203B3F4->unk9C, TRUE, TRUE);
}
void sub_803A9AC(void)

2
src/debug_menu4.c
View File

@ -126,7 +126,7 @@ void sub_803ACE8(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B3F8->unkE0, 1, 1);
sub_800641C(sUnknown_203B3F8->unkE0, TRUE, TRUE);
}
void sub_803AD88(void)

2
src/ds_menus.c
View File

@ -29,5 +29,5 @@ u32 UpdateWirelessCommsMenu(void)
void CleanWirelessCommsMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
}

8
src/felicity_bank.c
View File

@ -48,7 +48,7 @@ u32 CreateFelicityBank(s32 isAsleep)
struct OpenedFile * faceFile;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gFelicityBankWork = MemoryAlloc(sizeof(struct FelicityBankWork), 8);
gFelicityBankWork->menuAction = 0;
gFelicityBankWork->isAsleep = isAsleep;
@ -135,7 +135,7 @@ void sub_801645C(void)
gFelicityBankWork->unkA8[2].unk0 = 0x80;
gFelicityBankWork->unkA8[3] = gUnknown_80DB6F4;
ResetUnusedInputStruct();
sub_800641C(gFelicityBankWork->unkA8, 1, 0);
sub_800641C(gFelicityBankWork->unkA8, TRUE, FALSE);
break;
case 8:
case 11:
@ -144,14 +144,14 @@ void sub_801645C(void)
gFelicityBankWork->unkA8[3] = gUnknown_80DB6F4;
gFelicityBankWork->unkA8[2] = gUnknown_80DB70C;
ResetUnusedInputStruct();
sub_800641C(gFelicityBankWork->unkA8, 1, 0);
sub_800641C(gFelicityBankWork->unkA8, TRUE, FALSE);
break;
default:
for (index = 0; index < 4; index++) {
gFelicityBankWork->unkA8[index] = gUnknown_80DB6DC;
}
ResetUnusedInputStruct();
sub_800641C(gFelicityBankWork->unkA8, 1, 1);
sub_800641C(gFelicityBankWork->unkA8, TRUE, TRUE);
break;
}
}

2
src/friend_area_action_menu.c
View File

@ -266,7 +266,7 @@ void sub_802719C(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2BC->unk180, 1, 1);
sub_800641C(gUnknown_203B2BC->unk180, TRUE, TRUE);
}
void sub_8027274(void)

2
src/friend_list_menu.c
View File

@ -279,7 +279,7 @@ void sub_802544C(void)
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2B4->unk118,1,1);
sub_800641C(gUnknown_203B2B4->unk118, TRUE, TRUE);
}
void sub_8025518(void)

62
src/friend_rescue.c
View File

@ -310,7 +310,7 @@ u32 CreateFriendRescueMenu(void)
int counter;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B33C = MemoryAlloc(sizeof(struct WonderMailStruct_203B33C), 8);
MemoryFill8((u8 *) gUnknown_203B33C, 0, sizeof(struct WonderMailStruct_203B33C));
gUnknown_203B33C->unk530 = 0;
@ -815,7 +815,7 @@ void sub_8032828(void)
case 0x32:
if (sub_8030894() == 0) {
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(1, 0, NULL, 6);
}
break;
@ -839,7 +839,7 @@ void sub_8032828(void)
case 0x3A:
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B33C->unk218, 0);
break;
case 0x3B:
@ -891,7 +891,7 @@ void sub_8032828(void)
if (sub_8023CE8() != 0)
sub_8023C60();
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8023868(3, 0, 0, 9);
break;
case 0x27:
@ -912,7 +912,7 @@ void sub_8032828(void)
case 0x1D:
if (sub_8030894() == 0) {
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(4, 0, NULL, 6);
}
break;
@ -1019,7 +1019,7 @@ void sub_8032828(void)
if (sub_8030894() != 0)
break;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(1, 0, NULL, 6);
break;
case 0x15:
@ -1048,7 +1048,7 @@ void sub_8032828(void)
case 0x1A:
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, gUnknown_203B33C->passwordBuffer);
break;
case 0x5A:
@ -1066,7 +1066,7 @@ void sub_8032828(void)
case 0x5F:
if (sub_801D008() == 0) {
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
{
struct UnkTextStruct2_sub local_x = {3, 2};
sub_801C8C4(0, 1, &local_x, 9);
@ -1113,7 +1113,7 @@ void sub_8032828(void)
case 0x73:
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, gUnknown_203B33C->passwordBuffer);
break;
case 0x66:
@ -1123,7 +1123,7 @@ void sub_8032828(void)
case 0x2E:
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B33C->unk218, 0);
break;
case 0x68:
@ -1229,7 +1229,7 @@ void sub_8032828(void)
case 0x5C:
if (sub_8030894() == 0) {
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(5, 0, 0, 6);
}
break;
@ -1709,7 +1709,7 @@ void sub_8033DBC(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
@ -1781,7 +1781,7 @@ void sub_8033FE4(void)
gUnknown_203B33C->unk218 = sub_80307EC();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x1F);
break;
@ -1806,7 +1806,7 @@ void sub_8034074(void)
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x1F);
break;
@ -1827,7 +1827,7 @@ void sub_8034130(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@ -1864,7 +1864,7 @@ void sub_803418C(void)
gUnknown_203B33C->speciesNum = sub_8023B44();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B33C->speciesNum, 0);
SetFriendRescueMenuState(0x28);
break;
@ -1889,7 +1889,7 @@ void sub_8034254(void)
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B33C->speciesNum, 0);
SetFriendRescueMenuState(0x28);
break;
@ -1913,7 +1913,7 @@ void sub_8034310(void)
case 3:
sub_802453C();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_8023B7C(1);
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@ -2031,7 +2031,7 @@ void sub_80344C0(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x2F);
break;
case 1:
@ -2059,7 +2059,7 @@ void sub_8034500(void)
gUnknown_203B33C->unk218 = sub_80307EC();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x34);
break;
@ -2084,7 +2084,7 @@ void sub_8034590(void)
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x34);
break;
@ -2105,7 +2105,7 @@ void sub_803464C(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@ -2178,7 +2178,7 @@ void sub_803473C(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x3B);
break;
case 1:
@ -2337,7 +2337,7 @@ void sub_8034970(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(0x68);
break;
case 1:
@ -2383,7 +2383,7 @@ void sub_80349E0(void)
gUnknown_203B33C->unk218 = sub_80307EC();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x5E);
break;
@ -2408,7 +2408,7 @@ void sub_8034A70(void)
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B33C->unk218, 0);
SetFriendRescueMenuState(0x5E);
break;
@ -2429,7 +2429,7 @@ void sub_8034B2C(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@ -2464,7 +2464,7 @@ void sub_8034B88(void)
gUnknown_203B33C->item.id = sub_801CB24();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B33C->item);
SetFriendRescueMenuState(0x61);
break;
@ -2479,7 +2479,7 @@ void sub_8034C38(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
sub_801CB5C(TRUE);
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
@ -2513,7 +2513,7 @@ void sub_8034C98(void)
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B33C->item);
SetFriendRescueMenuState(0x61);
break;
@ -2577,7 +2577,7 @@ void sub_8034D74(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:

2
src/gulpin_shop.c
View File

@ -141,7 +141,7 @@ void sub_801E980(void)
}
ResetUnusedInputStruct();
sub_800641C(gGulpinShopWork->unk12C, 1, 1);
sub_800641C(gGulpinShopWork->unk12C, TRUE, TRUE);
}
void sub_801EA28(void)

14
src/gulpin_shop_1.c
View File

@ -146,7 +146,7 @@ bool8 sub_801FB50(bool32 isAsleep)
struct OpenedFile *faceFile;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B27C = MemoryAlloc(sizeof(struct unkStruct_203B27C), 0x8);
gUnknown_203B27C->menuAction2 = 0;
gUnknown_203B27C->menuAction3 = 0;
@ -273,21 +273,21 @@ void sub_801FDC0(void)
gUnknown_203B27C->unk180[2].unk0 = 0x80;
gUnknown_203B27C->unk180[3] = gUnknown_80DC37C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B27C->unk180, 1, 0);
sub_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);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B27C->unk180, 1, 1);
sub_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);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B27C->unk180, 1, 1);
sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
break;
case 0x20:
CreateGulpinLinkMenu();
@ -295,15 +295,15 @@ void sub_801FDC0(void)
gUnknown_203B27C->unk180[2] = gUnknown_80DC34C;
sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B27C->unk180, 1, 1);
sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
break;
default:
for(index = 0; index < 4; index++)
{
gUnknown_203B27C->unk180[index] = gUnknown_80DC31C;
gUnknown_203B27C->unk180[index] = gUnknown_80DC31C;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B27C->unk180, 1, 1);
sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE);
break;
}
}

12
src/hints_menu.c
View File

@ -61,7 +61,7 @@ u32 sub_801E3F0(u32 r0)
gUnknown_203B264->unk3C[gUnknown_203B264->unk34] = gUnknown_80DC0BC;
sub_8012D08(gUnknown_203B264->unk38, 0xA);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B264->unk3C, 1, 1);
sub_800641C(gUnknown_203B264->unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B264->input, 0x5, 0xA, r0);
sub_801E594();
DrawHintSelectionMenu();
@ -106,7 +106,7 @@ s32 GetChosenHintIndex(void)
void CreateHintSelectionScreen(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B264->unk3C, 0, 0);
sub_800641C(gUnknown_203B264->unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_203B264->input);
sub_801E594();
DrawHintSelectionMenu();
@ -120,7 +120,7 @@ void sub_801E54C(void)
{
gUnknown_203B264->unk3C[gUnknown_203B264->unk34] = gUnknown_80DC0A0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B264->unk3C, 1, 1);
sub_800641C(gUnknown_203B264->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B264);
gUnknown_203B264 = NULL;
}
@ -195,7 +195,7 @@ u32 CreateHintDisplayScreen(u32 index)
gUnknown_203B268->unk3C[gUnknown_203B268->unk34] = gUnknown_80DC0FC;
gUnknown_203B268->unk38->unk14 = gUnknown_203B268->unk9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B268->unk3C, 1, 1);
sub_800641C(gUnknown_203B268->unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B268->input, 5, 1, gUnknown_203B268->unk34);
gUnknown_203B268->input.unk1E = index;
sub_801E714();
@ -235,7 +235,7 @@ void DestroyHintDisplayScreen(void)
{
gUnknown_203B268->unk3C[gUnknown_203B268->unk34] = gUnknown_80DC0E4;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B268->unk3C, 1, 1);
sub_800641C(gUnknown_203B268->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B268);
gUnknown_203B268 = NULL;
}
@ -248,7 +248,7 @@ void sub_801E76C(void)
gUnknown_203B268->unk9C[2] = 0xF;
gUnknown_203B268->unk9C[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B268->unk3C, 1, 1);
sub_800641C(gUnknown_203B268->unk3C, TRUE, TRUE);
}
void DisplayChosenHint(void)

8
src/kangaskhan_storage.c
View File

@ -86,7 +86,7 @@ u32 CreateKangaskhanStorage(bool32 isAsleep)
struct OpenedFile *faceFile;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gKangaskhanStorageWork = MemoryAlloc(sizeof(struct KangaskhanStorageWork), 8);
gKangaskhanStorageWork->menuAction1 = 0;
gKangaskhanStorageWork->menuAction2 = 0;
@ -216,7 +216,7 @@ void sub_8016E80(void)
}
ResetUnusedInputStruct();
sub_800641C(gKangaskhanStorageWork->unkEC, 1, 1);
sub_800641C(gKangaskhanStorageWork->unkEC, TRUE, TRUE);
}
void sub_8016FF8(void)
@ -856,7 +856,7 @@ void AdvanceToKangaskhanStorageFallbackState(void)
u32 sub_8017E1C(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B20C = MemoryAlloc(sizeof(struct unkStruct_203B20C), 8);
gUnknown_203B20C->menuAction1 = 0;
gUnknown_203B20C->menuAction2 = 0;
@ -961,7 +961,7 @@ void sub_8017F28(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B20C->unkF0, 1, 1);
sub_800641C(gUnknown_203B20C->unkF0, TRUE, TRUE);
}
void sub_8018100(void)

26
src/kecleon_bros.c
View File

@ -256,7 +256,7 @@ void sub_8018D30(void)
}
ResetUnusedInputStruct();
sub_800641C(gKecleonBrosWork->unkE8, 1, 1);
sub_800641C(gKecleonBrosWork->unkE8, TRUE, TRUE);
}
void UpdateKecleonStoreDialogue(void)
@ -961,7 +961,7 @@ bool32 sub_8019E40(u32 r0)
gUnknown_203B214->unk3C[gUnknown_203B214->unk34] = gUnknown_80DB8CC;
gUnknown_203B214->unk38->unk14 = gUnknown_203B214->unk9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B214->unk3C, 1, 1);
sub_800641C(gUnknown_203B214->unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B214->input, CountKecleonShopItems(), 10, r0);
gUnknown_203B214->input.menuIndex = gUnknown_203B218;
sub_8013984(&gUnknown_203B214->input);
@ -1015,7 +1015,7 @@ u8 sub_8019FB0(void)
void sub_8019FCC(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B214->unk3C, 0, 0);
sub_800641C(gUnknown_203B214->unk3C, FALSE, FALSE);
gUnknown_203B214->input.unk22 = CountKecleonShopItems();
sub_8013984(&gUnknown_203B214->input);
sub_801A064();
@ -1030,7 +1030,7 @@ void sub_801A010(void)
gUnknown_203B218 = gUnknown_203B214->input.menuIndex;
gUnknown_203B214->unk3C[gUnknown_203B214->unk34] = gUnknown_80DB8B4;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B214->unk3C, 1, 1);
sub_800641C(gUnknown_203B214->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B214);
gUnknown_203B214 = NULL;
}
@ -1050,7 +1050,7 @@ void sub_801A064(void)
gUnknown_203B214->unk3C[gUnknown_203B214->unk34].unkE = val;
gUnknown_203B214->unk3C[gUnknown_203B214->unk34].unk10 = val + 2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B214->unk3C, 1, 1);
sub_800641C(gUnknown_203B214->unk3C, TRUE, TRUE);
}
#else
NAKED
@ -1169,7 +1169,7 @@ u32 sub_801A20C(u32 r0)
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34] = gUnknown_80DB914;
gUnknown_203B21C->unk38->unk14 = gUnknown_203B21C->unk9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B21C->unk3C, 1, 1);
sub_800641C(gUnknown_203B21C->unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B21C->input, CountKecleonWareItems(), 10, r0);
gUnknown_203B21C->input.menuIndex = gUnknown_203B220;
sub_8013984(&gUnknown_203B21C->input);
@ -1224,7 +1224,7 @@ u8 sub_801A37C(void)
void sub_801A398(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B21C->unk3C, 0, 0);
sub_800641C(gUnknown_203B21C->unk3C, FALSE, FALSE);
gUnknown_203B21C->input.unk22 = CountKecleonWareItems();
sub_8013984(&gUnknown_203B21C->input);
sub_801A430();
@ -1239,7 +1239,7 @@ void sub_801A3DC(void)
gUnknown_203B220 = gUnknown_203B21C->input.menuIndex;
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34] = gUnknown_80DB8FC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B21C->unk3C, 1, 1);
sub_800641C(gUnknown_203B21C->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B21C);
gUnknown_203B21C = NULL;
}
@ -1259,7 +1259,7 @@ void sub_801A430(void)
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34].unkE = val;
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34].unk10 = val + 2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B21C->unk3C, 1, 1);
sub_800641C(gUnknown_203B21C->unk3C, TRUE, TRUE);
}
#else
NAKED
@ -1387,7 +1387,7 @@ bool32 sub_801A5D8(u32 param_1, s32 param_2, struct UnkTextStruct2_sub *param_3,
sub_8012D08(gUnknown_203B224->unk8C, param_4);
sub_8099690(1);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B224->unk90, 1, 1);
sub_800641C(gUnknown_203B224->unk90, TRUE, TRUE);
sub_8013818(&gUnknown_203B224->input, GetNumberOfFilledInventorySlots(), param_4, param_2);
gUnknown_203B224->input.menuIndex = gUnknown_203B228;
gUnknown_203B224->input.unk1E = gUnknown_203B22A;
@ -1488,7 +1488,7 @@ void sub_801A8D0(u8 r0)
{
sub_8099690(1);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B224->unk90, 0, 0);
sub_800641C(gUnknown_203B224->unk90, FALSE, FALSE);
FillInventoryGaps();
gUnknown_203B224->input.unk22 = GetNumberOfFilledInventorySlots();
sub_8013984(&gUnknown_203B224->input);
@ -1506,7 +1506,7 @@ void sub_801A928(void)
gUnknown_203B224->unk90[gUnknown_203B224->unk88] = gUnknown_80DB944;
sub_8099690(0);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B224->unk90, 1, 1);
sub_800641C(gUnknown_203B224->unk90, TRUE, TRUE);
MemoryFree(gUnknown_203B224);
gUnknown_203B224 = NULL;
}
@ -1519,7 +1519,7 @@ void sub_801A998(void)
gUnknown_203B224->unkF0[2] = 11;
gUnknown_203B224->unkF0[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B224->unk90, 1, 1);
sub_800641C(gUnknown_203B224->unk90, TRUE, TRUE);
}
void sub_801A9E0(void)

4
src/load_screen.c
View File

@ -167,7 +167,7 @@ void CreateLoadScreen(u32 currMenu)
gLoadScreen->unk144[index] = gUnknown_80E75F8;
}
ResetUnusedInputStruct();
sub_800641C(gLoadScreen->unk144,1,1);
sub_800641C(gLoadScreen->unk144, TRUE, TRUE);
SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,0,6,0);
switch(gLoadScreen->currMenu){
case MENU_CONTINUE:
@ -196,7 +196,7 @@ void CreateLoadScreen(u32 currMenu)
void CleanLoadScreen(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
if(gLoadScreen != NULL)
{
MemoryFree(gLoadScreen);

4
src/luminous_cave.c
View File

@ -201,7 +201,7 @@ u32 sub_802465C(void)
struct OpenedFile *faceFile;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B2B0 = MemoryAlloc(sizeof(struct unkStruct_203B2B0),8);
gUnknown_203B2B0->menuAction1 = 0;
gUnknown_203B2B0->menuAction2 = 0;
@ -317,7 +317,7 @@ void sub_8024804(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2B0->unk114, 1, 1);
sub_800641C(gUnknown_203B2B0->unk114, TRUE, TRUE);
}
void UpdateLuminousCaveDialogue(void)

2
src/mailbox.c
View File

@ -207,7 +207,7 @@ void sub_802E0A0(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B304->unk10C, 1, 1);
sub_800641C(gUnknown_203B304->unk10C, TRUE, TRUE);
}
void sub_802E1AC(void)

8
src/main_menu.c
View File

@ -625,7 +625,7 @@ void SetMenuItems(struct MenuStruct *param_1, struct UnkTextStruct2 *unkData, s3
{
unkData[index] = *param_4;
ResetUnusedInputStruct();
sub_800641C(unkData,1,1);
sub_800641C(unkData, TRUE, TRUE);
if (param_6 != 0) {
sub_8012D60(&param_1[index],menuItems,0,0,menuAction,index);
}
@ -640,7 +640,7 @@ void sub_8035CC0(struct UnkTextStruct2 *dataArray, u32 index)
sub_8006518(dataArray);
dataArray[index] = gUnknown_80E59A8;
ResetUnusedInputStruct();
sub_800641C(dataArray, 1, 1);
sub_800641C(dataArray, TRUE, TRUE);
}
void sub_8035CF4(struct MenuStruct * Menu, u32 index, bool8 r2)
@ -769,7 +769,7 @@ void DrawMainMenu(void)
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B34C->unk144, 1, 1);
sub_800641C(gUnknown_203B34C->unk144, TRUE, TRUE);
SetMainMenuItems();
gUnknown_203B34C->currMenuChoice = -1;
@ -785,7 +785,7 @@ void DrawMainMenu(void)
void CleanMainMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
if(gUnknown_203B34C != NULL)
{
MemoryFree(gUnknown_203B34C);

10
src/makuhita_dojo.c
View File

@ -104,7 +104,7 @@ u32 MakuhitaDojo_New(u32 mode)
u32 initialState;
ResetUnusedInputStruct();
sub_800641C(NULL, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B318 = MemoryAlloc(sizeof(struct unkStruct_203B318), 8);
gUnknown_203B318->unk10 = -1;
gUnknown_203B318->mode = mode;
@ -228,7 +228,7 @@ void sub_802FF1C(void)
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B318->unk6C, 1, 1);
sub_800641C(gUnknown_203B318->unk6C, TRUE, TRUE);
}
void MakuhitaDojo_UpdateDialogue(void)
@ -399,7 +399,7 @@ bool8 sub_80302E8(s32 param_1, struct UnkTextStruct2_sub *param_2, u32 param_3)
sub_8012D08(gUnknown_203B31C->unk68, param_3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B31C->unk6C, 1, 1);
sub_800641C(gUnknown_203B31C->unk6C, TRUE, TRUE);
sub_8013818(&gUnknown_203B31C->input, sub_8030668(), param_3, param_1);
sub_80304C8();
MakuhitaDojo_DrawCourseList();
@ -452,7 +452,7 @@ void sub_8030480(void)
if (gUnknown_203B31C != NULL) {
gUnknown_203B31C->unk6C[gUnknown_203B31C->unk64] = gUnknown_80E07EC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B31C->unk6C, 1, 1);
sub_800641C(gUnknown_203B31C->unk6C, TRUE, TRUE);
MemoryFree(gUnknown_203B31C);
gUnknown_203B31C = NULL;
}
@ -472,7 +472,7 @@ void sub_80304C8(void)
gUnknown_203B31C->unk6C[gUnknown_203B31C->unk64].unkE = test;
gUnknown_203B31C->unk6C[gUnknown_203B31C->unk64].unk10 = test + 2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B31C->unk6C, 1, 1);
sub_800641C(gUnknown_203B31C->unk6C, TRUE, TRUE);
}
#else
NAKED

6
src/options_menu.c
View File

@ -194,7 +194,7 @@ void sub_801DD84(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B25C->unkBC, 1, 1);
sub_800641C(gUnknown_203B25C->unkBC, TRUE, TRUE);
}
void sub_801DED0(void)
@ -378,7 +378,7 @@ bool8 sub_801E198(struct GameOptions *optionsMenu)
gUnknown_203B260->unk4C[gUnknown_203B260->unk44] = gUnknown_80DC03C;
sub_8012D08(gUnknown_203B260->unk48,1);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B260->unk4C,1,1);
sub_800641C(gUnknown_203B260->unk4C, TRUE, TRUE);
sub_8013818(&gUnknown_203B260->input,1,1,gUnknown_203B260->unk44);
nullsub_38();
CreateOptionsMenu();
@ -443,7 +443,7 @@ void sub_801E2C4(void)
{
gUnknown_203B260->unk4C[gUnknown_203B260->unk44] = gUnknown_80DC020;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B260->unk4C, 1, 1);
sub_800641C(gUnknown_203B260->unk4C, TRUE, TRUE);
MemoryFree(gUnknown_203B260);
gUnknown_203B260 = NULL;
}

26
src/other_menus.c
View File

@ -446,7 +446,6 @@ extern void sub_8037748(void);
extern void sub_80371B8(void);
extern void sub_8037900(void);
extern u32 sub_8037798(void);
extern void sub_8005838(u32, u32);
extern void sub_800CB20();
extern void TransferBGPaletteBuffer();
extern void xxx_call_update_bg_vram();
@ -466,7 +465,7 @@ void sub_8036FDC(s32 param_1)
int index2;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
ResetSprites(FALSE);
if (gUnknown_203B35C == NULL) {
gUnknown_203B35C = MemoryAlloc(sizeof(struct unkStruct_203B35C),8);
@ -485,7 +484,7 @@ void sub_8036FDC(s32 param_1)
gUnknown_203B35C->unk15C[index2] = gUnknown_80E653C;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B35C->unk15C,1,1);
sub_800641C(gUnknown_203B35C->unk15C, TRUE, TRUE);
SetMenuItems(gUnknown_203B35C->unk1C,gUnknown_203B35C->unk15C,0,&gUnknown_80E6CD0,gUnknown_80E6CE8,0,6,0);
sub_8035CF4(gUnknown_203B35C->unk1C,0,TRUE);
sub_80376CC();
@ -633,19 +632,18 @@ void sub_80371B8(void)
void sub_80373C4(void)
{
sub_8005838(0,0);
sub_80060EC();
sub_800CB20();
LoadBufferedInputs();
TransferBGPaletteBuffer();
xxx_call_update_bg_vram();
sub_8009908();
xxx_call_update_bg_sound_input();
ResetSprites(FALSE);
sub_8005838(NULL, 0);
sub_80060EC();
sub_800CB20();
LoadBufferedInputs();
TransferBGPaletteBuffer();
xxx_call_update_bg_vram();
sub_8009908();
xxx_call_update_bg_sound_input();
ResetSprites(FALSE);
}
// Unused
struct unkStruct_203B35C *sub_80373F4(void)
UNUSED static struct unkStruct_203B35C *sub_80373F4(void)
{
return gUnknown_203B35C;
}

2
src/party_list_menu.c
View File

@ -346,7 +346,7 @@ void sub_802608C(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2B8->unk220, 1, 1);
sub_800641C(gUnknown_203B2B8->unk220, TRUE, TRUE);
}
void sub_80261D0(void)

2
src/pelipper_board.c
View File

@ -196,7 +196,7 @@ void sub_802E94C(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gPelipperBoard->unk10C, 1, 1);
sub_800641C(gPelipperBoard->unk10C, TRUE, TRUE);
}
void sub_802EA58(void)

8
src/personality_test.c
View File

@ -728,7 +728,7 @@ void PersonalityTest_DisplayStarterSprite(void)
sub_8006518(stackArray);
stackArray[1] = gUnknown_80F4244;
ResetUnusedInputStruct();
sub_800641C(stackArray, 1, 0);
sub_800641C(stackArray, TRUE, FALSE);
sub_8008C54(1);
sub_80073B8(1);
faceFile = GetDialogueSpriteDataPtr(starterID);
@ -764,7 +764,7 @@ void CreatePartnerSelectionMenu(s16 starterID)
gUnknown_203B404->unkb4[2] = 6;
gUnknown_203B404->unkb4[3] = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B404->unk54, 1, 1);
sub_800641C(gUnknown_203B404->unk54, TRUE, TRUE);
sub_8013818(&gUnknown_203B404->input, GetValidPartners(), 0xA, gUnknown_203B404->unk4C);
RedrawPartnerSelectionMenu();
PersonalityTest_DisplayPartnerSprite();
@ -812,7 +812,7 @@ void sub_803CE6C()
{
gUnknown_203B404->unk54[gUnknown_203B404->unk4C] = gUnknown_80F4278;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B404->unk54, 1, 1);
sub_800641C(gUnknown_203B404->unk54, TRUE, TRUE);
sub_803CECC(); // Free 203B404
}
@ -856,7 +856,7 @@ void RedrawPartnerSelectionMenu(void)
// Everything after this matches
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B404->unk54,1,1);
sub_800641C(gUnknown_203B404->unk54, TRUE, TRUE);
sub_8008C54(gUnknown_203B404->unk4C);
sub_80073B8(gUnknown_203B404->unk4C);
xxx_call_draw_string(0xc, 0, gPartnerSelectionHeaderText, gUnknown_203B404->unk4C, 0);

16
src/pokemon_news.c
View File

@ -192,7 +192,7 @@ u32 sub_802B640(u32 r0, struct UnkTextStruct2_sub *r1, u32 r2)
sub_8012D08(gUnknown_203B2CC->unk70, r2);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2CC->unk74, 1, 1);
sub_800641C(gUnknown_203B2CC->unk74, TRUE, TRUE);
sub_8013818(&gUnknown_203B2CC->input, GetNumPKMNNews(), r2, r0);
@ -244,7 +244,7 @@ u8 GetPokemonNewsIndex(void)
void sub_802B7D0(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2CC->unk74, 0, 0);
sub_800641C(gUnknown_203B2CC->unk74, FALSE, FALSE);
gUnknown_203B2CC->input.unk22 = GetNumPKMNNews();
sub_8013984(&gUnknown_203B2CC->input);
@ -265,7 +265,7 @@ void sub_802B81C(void)
gUnknown_203B2CC->unk74[gUnknown_203B2CC->unk6C] = gUnknown_80DFBD0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2CC->unk74, 1, 1);
sub_800641C(gUnknown_203B2CC->unk74, TRUE, TRUE);
MemoryFree(gUnknown_203B2CC);
gUnknown_203B2CC = NULL;
@ -381,7 +381,7 @@ u32 sub_802B9FC(u8 mailIndex)
gUnknown_203B2D4->unk28[2] = gUnknown_80DFC18;
gUnknown_203B2D4->unk28[3] = gUnknown_80DFC18;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2D4->unk28, 1, 1);
sub_800641C(gUnknown_203B2D4->unk28, TRUE, TRUE);
gUnknown_203B2D4->unk8 = 0;
sub_802BCC4();
sub_802BC7C();
@ -413,7 +413,7 @@ void sub_802BACC(void)
if (gUnknown_203B2D4 != NULL) {
gUnknown_203B2D4->unk28[gUnknown_203B2D4->unk24] = gUnknown_80DFC18;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2D4->unk28, 1, 1);
sub_800641C(gUnknown_203B2D4->unk28, TRUE, TRUE);
MemoryFree(gUnknown_203B2D4);
gUnknown_203B2D4 = NULL;
}
@ -540,7 +540,7 @@ u32 sub_802BD14(s32 param_1, struct UnkTextStruct2_sub *param_2, u32 param_3)
sub_8012D34(gUnknown_203B2D8->unk3C,param_3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2D8->unk40,1,1);
sub_800641C(gUnknown_203B2D8->unk40, TRUE, TRUE);
sub_8013848(&gUnknown_203B2D8->input,CountEmptyMailSlots(),param_3,param_1);
gUnknown_203B2D8->input.menuIndex = gUnknown_203B2DC;
sub_8013984(&gUnknown_203B2D8->input);
@ -585,7 +585,7 @@ u8 sub_802BE74(void)
void sub_802BE94(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2D8->unk40, 0, 0);
sub_800641C(gUnknown_203B2D8->unk40, FALSE, FALSE);
gUnknown_203B2D8->input.unk22 = CountEmptyMailSlots();
sub_8013984(&gUnknown_203B2D8->input);
@ -602,7 +602,7 @@ void sub_802BEDC(void)
gUnknown_203B2DC = gUnknown_203B2D8->input.menuIndex;
gUnknown_203B2D8->unk40[gUnknown_203B2D8->unk38] = gUnknown_80DFC5C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2D8->unk40, 1, 1);
sub_800641C(gUnknown_203B2D8->unk40, TRUE, TRUE);
MemoryFree(gUnknown_203B2D8);
gUnknown_203B2D8 = NULL;
}

6
src/post_office_guide.c
View File

@ -210,7 +210,7 @@ u32 CreateHelperPelipperMenu(s16 speciesID)
species_32 = speciesID;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gPostOfficeHelper = MemoryAlloc(sizeof(struct PostOfficeHelper), 8);
CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, speciesID);
monName = GetMonSpecies(speciesID);
@ -559,7 +559,7 @@ void sub_8031A3C(void)
{
gUnknown_203B330->unk18[gUnknown_203B330->unk10] = gUnknown_80E1EFC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B330->unk18, 1, 1);
sub_800641C(gUnknown_203B330->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B330);
gUnknown_203B330 = NULL;
}
@ -579,7 +579,7 @@ void sub_8031A84(void)
sub_8012D08(gUnknown_203B330->unk14,jobs);
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B330->unk18,1,1);
sub_800641C(gUnknown_203B330->unk18, TRUE, TRUE);
}
void DisplayMissionObjectives(void)

12
src/rescue_password_menu.c
View File

@ -275,7 +275,7 @@ void CreateRescuePasswordMenu(u32 currMenu)
gRescuePasswordMenu->unk148[counter] = gUnknown_80E71E4;
ResetUnusedInputStruct();
sub_800641C(gRescuePasswordMenu->unk148, 1, 1);
sub_800641C(gRescuePasswordMenu->unk148, TRUE, TRUE);
if ((gUnknown_203B368 != 0) || (gUnknown_203B36C != currMenu)) {
for(counter = 0; counter < RESCUE_PASSWORD_SIZE; counter++)
@ -320,7 +320,7 @@ void CleanRescuePasswordMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
if (gRescuePasswordMenu != NULL) {
sub_80155F0();
sub_8031E10();
@ -501,7 +501,7 @@ s32 UpdateRescuePasswordMenu(void)
case 0xC:
sub_8039174();
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4,gRescuePasswordBuffer);
gRescuePasswordMenu->state = 8;
subtract = gRescuePasswordMenu->currMenu - 0x21;
@ -529,7 +529,7 @@ s32 UpdateRescuePasswordMenu(void)
case 0xC:
sub_8039174();
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4,gRescuePasswordBuffer);
gRescuePasswordMenu->state = ConvertMenutoRescuePasswordState(gRescuePasswordMenu->currMenu);
subtract = gRescuePasswordMenu->currMenu - 0x21;
@ -552,7 +552,7 @@ void DisplayRescuePasswordError(u32 passwordError)
{
sub_8006518(gRescuePasswordMenu->unk1A8);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80155F0();
switch(passwordError) {
case PASSWORD_ENTRY_INCORRECT_PASSWORD:
@ -592,7 +592,7 @@ void DisplayPasswordAcceptScreen(void)
{
sub_8006518(gRescuePasswordMenu->unk1A8);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80155F0();
SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,0,0xd,0);
sub_8035CF4(gRescuePasswordMenu->unk8,0,TRUE);

4
src/save_menu.c
View File

@ -143,7 +143,7 @@ void CreateSaveMenu(s32 currMenu)
gUnknown_203B364->unk148[index] = gUnknown_80E6F20;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B364->unk148,1,1);
sub_800641C(gUnknown_203B364->unk148, TRUE, TRUE);
if (currMenu == MENU_DELETE_SAVE) {
// Beware, Deleting your Adventure
@ -164,7 +164,7 @@ void CreateSaveMenu(s32 currMenu)
void CleanSaveMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
if (gUnknown_203B364 != NULL) {
MemoryFree(gUnknown_203B364);
gUnknown_203B364 = NULL;

7
src/text1.c
View File

@ -35,7 +35,7 @@ extern const char gKanjiB_file_string[];
// system_sbin.s
extern const struct FileArchive gSystemFileArchive;
static void sub_8006438(const struct UnkTextStruct2 *, u8, u8, struct UnkTextStruct2_sub *);
static void sub_8006438(const struct UnkTextStruct2 *, bool8, bool8, struct UnkTextStruct2_sub *);
void LoadCharmaps(void)
{
@ -142,13 +142,14 @@ void sub_80063D8(int a0)
gUnknown_202B030 = retval;
}
void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2)
// TODO: Move sub_800641C and sub_8006438 to text2.c ?
void sub_800641C(struct UnkTextStruct2 *a0, bool8 a1, bool8 a2)
{
struct UnkTextStruct2_sub r3 = {0, 0};
sub_8006438(a0, a1, a2, &r3);
}
static void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, struct UnkTextStruct2_sub *a3)
static void sub_8006438(const struct UnkTextStruct2 *a0, bool8 a1, bool8 a2, struct UnkTextStruct2_sub *a3)
{
s32 i;
u32 r9;

10
src/text2.c
View File

@ -48,7 +48,7 @@ u32 sub_8006544(u32 index)
}
// a1 is a VRAM pointer
void sub_8006554(struct UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const struct UnkTextStruct2 *a5, u8 a6, u32 a7, struct UnkTextStruct2_sub *a8, u8 a9)
void sub_8006554(struct UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const struct UnkTextStruct2 *a5, bool8 a6, u32 a7, struct UnkTextStruct2_sub *a8, u8 a9)
{
struct UnkTextStruct1 *t1;
s32 iVar3;
@ -100,19 +100,19 @@ void sub_8006554(struct UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, c
temp = iVar5 - 1;
if (t1->unkC == 6) {
uVar1 = (a6 != 0) ? t1->unk14 : 0;
uVar1 = a6 ? t1->unk14 : 0;
sub_8006E94(t1, temp, uVar1, a5->unk14, a3);
temp = iVar5 + 2;
uVar1 = (a6 != 0) ? t1->unk14 + t1->unk4 * (a5->unk12 + 2) : 0;
uVar1 = a6 ? t1->unk14 + t1->unk4 * (a5->unk12 + 2) : 0;
numI = t1->unk6 - 2;
}
else {
sub_800677C(t1, temp, a3, a9);
temp = iVar5;
uVar1 = (a6 != 0) ? t1->unk14 : 0;
uVar1 = a6 ? t1->unk14 : 0;
numI = t1->unk6;
}
@ -125,7 +125,7 @@ void sub_8006554(struct UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, c
sub_8006AC4(t1, iVar6, temp, uVar1, a3);
iVar6++;
if (a6 != 0)
if (a6)
uVar1++;
}

26
src/thank_you_wonder_mail.c
View File

@ -243,7 +243,7 @@ u32 CreateThankYouMailPelipper(void)
struct unkStruct_203B480 *mail;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B2C4 = MemoryAlloc(sizeof(struct WonderMailStruct_203B2C4), 8);
MemoryFill8((u8 *)gUnknown_203B2C4, 0, sizeof(struct WonderMailStruct_203B2C4));
@ -531,7 +531,7 @@ void sub_802A050(void)
case 2:
sub_8031E10();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C4->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C4->unk3BC, TRUE, TRUE);
SetThankYouMailMenuState(0x1B);
break;
case 1:
@ -579,7 +579,7 @@ void sub_802A0C8(void)
gUnknown_203B2C4->mailIndex = sub_80307EC();
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C4->mailIndex,0);
SetThankYouMailMenuState(0x12);
break;
@ -615,7 +615,7 @@ void sub_802A174(void)
gUnknown_203B2C4->fallbackState = 0x2b;
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C4->mailIndex,0);
SetThankYouMailMenuState(0x12);
break;
@ -637,7 +637,7 @@ void sub_802A230(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C4->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C4->unk3BC, TRUE, TRUE);
sub_803092C();
if (gUnknown_203B2C4->fallbackState == 0x2b) {
sub_8035CF4(gUnknown_203B2C4->unk21C, 3, TRUE);
@ -674,7 +674,7 @@ void sub_802A28C(void)
gUnknown_203B2C4->unk41C.id = sub_801CB24();
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B2C4->unk41C);
SetThankYouMailMenuState(SHOW_ITEM_TO_SEND_INFO);
break;
@ -689,7 +689,7 @@ void sub_802A33C(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C4->unk3BC,1,1);
sub_800641C(gUnknown_203B2C4->unk3BC, TRUE, TRUE);
sub_801CB5C(TRUE);
if (gUnknown_203B2C4->fallbackState == 0x2b) {
sub_8035CF4(gUnknown_203B2C4->unk21C,3,TRUE);
@ -725,7 +725,7 @@ void sub_802A39C(void)
gUnknown_203B2C4->fallbackState = 0x2b;
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gUnknown_203B2C4->unk41C);
SetThankYouMailMenuState(SHOW_ITEM_TO_SEND_INFO);
break;
@ -838,7 +838,7 @@ void HandleThankYouMailPasswordMenu(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C4->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C4->unk3BC, TRUE, TRUE);
SetThankYouMailMenuState(ANYTHING_ELSE_THANK_YOU_MAIN_MENU);
break;
}
@ -1275,7 +1275,7 @@ void UpdateThankYouMailText(void)
if (sub_8030894() != 0)
break;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(WONDER_MAIL_TYPE_THANK_YOU,0,0,6);
break;
case 0x11:
@ -1288,7 +1288,7 @@ void UpdateThankYouMailText(void)
if (sub_801D008() != 0)
break;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
{
struct UnkTextStruct2_sub local_x = {3, 2};
sub_801C8C4(0, 1, &local_x, 9);
@ -1344,13 +1344,13 @@ void UpdateThankYouMailText(void)
case PROCESS_THANK_YOU_PASSWORD:
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4,gUnknown_203B2C4->passwordBuffer);
break;
case 0x1a:
sub_8006518(gUnknown_203B2C4->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B2C4->mailIndex,0);
break;
case 0x1b:

12
src/trade_items_menu.c
View File

@ -144,7 +144,7 @@ s32 CreateTradeItemsMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gTradeItemsMenu = MemoryAlloc(sizeof(struct TradeItemsMenu), 8);
MemoryFill8((u8 *)gTradeItemsMenu, 0, sizeof(struct TradeItemsMenu));
sub_8035C1C();
@ -276,7 +276,7 @@ void sub_80365AC(void)
gTradeItemsMenu->itemToSend.quantity = 1;
sub_8006518(gTradeItemsMenu->unk1E4);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gTradeItemsMenu->itemToSend);
SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO);
break;
@ -300,7 +300,7 @@ void sub_8036674(void)
gTradeItemsMenu->fallbackState = 0x13;
sub_8006518(gTradeItemsMenu->unk1E4);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_801B3C0(&gTradeItemsMenu->itemToSend);
SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO);
break;
@ -322,7 +322,7 @@ void sub_8036728(void)
case 3:
sub_801B450();
ResetUnusedInputStruct();
sub_800641C(gTradeItemsMenu->unk1E4, 1, 1);
sub_800641C(gTradeItemsMenu->unk1E4, TRUE, TRUE);
sub_801CB5C(TRUE);
if (gTradeItemsMenu->fallbackState == 0x13) {
sub_8035CF4(gTradeItemsMenu->unk44, 3, TRUE);
@ -603,7 +603,7 @@ void sub_8036B28(void)
case TRADE_ITEMS_SEND_ITEM_SELECTION:
if (sub_801D008() == 0) {
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
{
struct UnkTextStruct2_sub local_10 = {3, 2};
sub_801C8C4(0,1,&local_10,9);
@ -750,7 +750,7 @@ void sub_8036ECC(u32 index, u32 r1)
sub_8013AA0(&gTradeItemsMenu->quantityToSend);
gTradeItemsMenu->unk184[index] = gUnknown_80E6174;
ResetUnusedInputStruct();
sub_800641C(gTradeItemsMenu->unk184, 1, 1);
sub_800641C(gTradeItemsMenu->unk184, TRUE, TRUE);
}
void sub_8036F30(void)

4
src/unk_menu_203B360.c
View File

@ -69,7 +69,7 @@ void sub_80382E4(s32 currMenu)
gUnknown_203B360->unk148[index] = gUnknown_80E6E7C;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B360->unk148,1,1);
sub_800641C(gUnknown_203B360->unk148, TRUE, TRUE);
if (currMenu == 0x25) {
// Caution!
// The storage space is empty!
@ -86,7 +86,7 @@ void sub_80382E4(s32 currMenu)
void sub_80383A8(void)
{
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
if (gUnknown_203B360 != 0) {
MemoryFree(gUnknown_203B360);
gUnknown_203B360 = 0;

14
src/wigglytuff_shop.c
View File

@ -144,7 +144,7 @@ bool8 sub_80211AC(u32 mode, u32 param_2)
gUnknown_203B280->unk7C[gUnknown_203B280->unk74] = gUnknown_80DC47C;
gUnknown_203B280->unk78->unk14 = gUnknown_203B280->unkDC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B280->unk7C, 1, 1);
sub_800641C(gUnknown_203B280->unk7C, TRUE, TRUE);
sub_8013818(&gUnknown_203B280->unk40, sub_8021664(), 10, param_2);
if(gUnknown_203B284 == gUnknown_203B280->mode)
{
@ -202,7 +202,7 @@ u8 sub_802132C(void)
void sub_8021354(bool8 param_1)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B280->unk7C,0,0);
sub_800641C(gUnknown_203B280->unk7C, FALSE, FALSE);
gUnknown_203B280->unk40.unk22 = sub_8021664();
sub_8013984(&gUnknown_203B280->unk40);
sub_8021410();
@ -221,7 +221,7 @@ void sub_80213A0(void)
gUnknown_203B28A = gUnknown_203B280->unk40.unk1E;
gUnknown_203B280->unk7C[gUnknown_203B280->unk74] = gUnknown_80DC464;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B280->unk7C, 1, 1);
sub_800641C(gUnknown_203B280->unk7C, TRUE, TRUE);
MemoryFree(gUnknown_203B280);
gUnknown_203B280 = NULL;
}
@ -466,7 +466,7 @@ void sub_8021830(void)
{
gUnknown_203B28C->unk7C[gUnknown_203B28C->unk74] = gUnknown_80DC4BC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B28C->unk7C, 1, 1);
sub_800641C(gUnknown_203B28C->unk7C, TRUE, TRUE);
MemoryFree(gUnknown_203B28C);
gUnknown_203B28C = NULL;
}
@ -475,7 +475,7 @@ void sub_8021830(void)
void sub_8021878(void)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B28C->unk7C, 1, 1);
sub_800641C(gUnknown_203B28C->unk7C, TRUE, TRUE);
}
void sub_8021894(void)
@ -588,7 +588,7 @@ bool8 CreateWigglytuffShop(bool32 isAsleep)
struct OpenedFile *file;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gWigglytuffShop = MemoryAlloc(sizeof(struct WigglytuffShop), 8);
gWigglytuffShop->menuAction1 = 0;
gWigglytuffShop->menuAction2 = 0;
@ -697,7 +697,7 @@ void sub_8021D5C(void)
}
ResetUnusedInputStruct();
sub_800641C(gWigglytuffShop->unkD0, 1, 1);
sub_800641C(gWigglytuffShop->unkD0, TRUE, TRUE);
}
void UpdateWigglytuffDialogue(void)

34
src/wonder_mail.c
View File

@ -272,7 +272,7 @@ u32 sub_8027F88(void)
s32 counter;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B2C0 = MemoryAlloc(sizeof(struct WonderMailStruct_203B2C0), 8);
MemoryFill8((u8 *)gUnknown_203B2C0, 0, sizeof(struct WonderMailStruct_203B2C0));
gUnknown_203B2C0->unk53C = 0;
@ -507,7 +507,7 @@ void sub_8028348(void)
case 0x3B:
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8031D70(gUnknown_203B2C0->mailIndex, 0);
break;
case 0x3C:
@ -542,7 +542,7 @@ void sub_8028348(void)
if(sub_8023CE8() == 0)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8023868(3, 0, 0, 9);
}
break;
@ -568,7 +568,7 @@ void sub_8028348(void)
if(sub_8030894() == 0)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80306A8(WONDER_MAIL_TYPE_AOK, 0, 0, 6);
}
break;
@ -659,7 +659,7 @@ void sub_8028348(void)
case 0x27:
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(4, gUnknown_203B2C0->passwordBuffer);
break;
case 8:
@ -695,7 +695,7 @@ void sub_8028348(void)
if(sub_8030894() == 0)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
// SOS Mail
sub_80306A8(2, 0, 0, 6);
}
@ -1201,7 +1201,7 @@ void sub_8029044(void)
gUnknown_203B2C0->mailIndex = sub_80307EC();
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C0->mailIndex, 0);
SetFriendRescueCounterState(0x21);
break;
@ -1237,7 +1237,7 @@ void sub_80290F0(void)
gUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C0->mailIndex, 0);
SetFriendRescueCounterState(0x21);
break;
@ -1260,7 +1260,7 @@ void sub_80291AC(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C0->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@ -1477,7 +1477,7 @@ void sub_80293F4(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C0->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C0->unk3BC, TRUE, TRUE);
SetFriendRescueCounterState(FRIEND_RESCUE_MAIN);
break;
default:
@ -1550,7 +1550,7 @@ void sub_80295D8(void)
gUnknown_203B2C0->mailIndex = sub_80307EC();
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C0->mailIndex, 0);
SetFriendRescueCounterState(0x2C);
break;
@ -1586,7 +1586,7 @@ void sub_8029684(void)
gUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8030D40(gUnknown_203B2C0->mailIndex, 0);
SetFriendRescueCounterState(0x2C);
break;
@ -1607,7 +1607,7 @@ void sub_8029740(void)
case 3:
sub_8030DE4();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C0->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_803092C();
if(gUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@ -1660,7 +1660,7 @@ void sub_80297D4(void)
gUnknown_203B2C0->speciesNum = sub_8023B44();
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B2C0->speciesNum, 0);
SetFriendRescueCounterState(0x35);
break;
@ -1686,7 +1686,7 @@ void sub_8029884(void)
gUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE;
sub_8006518(gUnknown_203B2C0->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
sub_8024458(gUnknown_203B2C0->speciesNum, 0);
SetFriendRescueCounterState(0x35);
break;
@ -1716,7 +1716,7 @@ void sub_8029944(void)
case 3:
sub_802453C();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C0->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C0->unk3BC, TRUE, TRUE);
sub_8023B7C(1);
if(gUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE)
{
@ -1856,7 +1856,7 @@ void sub_8029AF4(void)
case 3:
sub_8031E10();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2C0->unk3BC, 1, 1);
sub_800641C(gUnknown_203B2C0->unk3BC, TRUE, TRUE);
SetFriendRescueCounterState(0x3C);
break;
case 1:

2
src/wonder_mail_2.c
View File

@ -86,7 +86,7 @@ u32 sub_802B2D4(void)
struct OpenedFile *faceFile;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B2C8 = MemoryAlloc(sizeof(struct unkStruct_203B2C8),8);
MemoryFill8((u8 *)gUnknown_203B2C8,0,sizeof(struct unkStruct_203B2C8));
gUnknown_203B2C8->unk1 = -1;

8
src/wonder_mail_2_1.c
View File

@ -165,7 +165,7 @@ bool8 sub_802C4C8(int param_1,struct UnkTextStruct2_sub *param_2,u32 param_3)
sub_8012D34(gUnknown_203B2E8->unk40,param_3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E8->unk44,1,1);
sub_800641C(gUnknown_203B2E8->unk44, TRUE, TRUE);
sub_8013848(&gUnknown_203B2E8->input,CountAcceptedJobs(),param_3,param_1);
gUnknown_203B2E8->input.menuIndex = gUnknown_203B2EC;
sub_8013984(&gUnknown_203B2E8->input);
@ -213,7 +213,7 @@ u8 GetPelipperBoardSlotIndex(void)
void sub_802C640(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E8->unk44, 0, 0);
sub_800641C(gUnknown_203B2E8->unk44, FALSE, FALSE);
gUnknown_203B2E8->input.unk22 = CountAcceptedJobs();
sub_8013984(&gUnknown_203B2E8->input);
sub_802C6DC();
@ -229,7 +229,7 @@ void sub_802C688(void)
gUnknown_203B2EC = gUnknown_203B2E8->input.menuIndex;
gUnknown_203B2E8->unk44[gUnknown_203B2E8->unk3C] = gUnknown_80DFCE4;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E8->unk44, 1, 1);
sub_800641C(gUnknown_203B2E8->unk44, TRUE, TRUE);
MemoryFree(gUnknown_203B2E8);
gUnknown_203B2E8 = NULL;
}
@ -428,7 +428,7 @@ void sub_802C928(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2F0->unk19C, 1, 1);
sub_800641C(gUnknown_203B2F0->unk19C, TRUE, TRUE);
}
void sub_802C9D8(void)

6
src/wonder_mail_2_mid.c
View File

@ -145,7 +145,7 @@ bool8 sub_802C10C(s32 param_1,struct UnkTextStruct2_sub *param_2,s32 param_3)
sub_8012D34(gUnknown_203B2E0->unk40,param_3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E0->unk44,1,1);
sub_800641C(gUnknown_203B2E0->unk44, TRUE, TRUE);
sub_8013848(&gUnknown_203B2E0->input,CountPelipperBoardSlots(),param_3,param_1);
gUnknown_203B2E0->input.menuIndex = gUnknown_203B2E4;
sub_8013984(&gUnknown_203B2E0->input);
@ -194,7 +194,7 @@ u8 sub_802C26C(void)
void sub_802C28C(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E0->unk44, 0, 0);
sub_800641C(gUnknown_203B2E0->unk44, FALSE, FALSE);
gUnknown_203B2E0->input.unk22 = CountPelipperBoardSlots();
sub_8013984(&gUnknown_203B2E0->input);
sub_802C328();
@ -210,7 +210,7 @@ void sub_802C2D4(void)
gUnknown_203B2E4 = gUnknown_203B2E0->input.menuIndex;
gUnknown_203B2E0->unk44[gUnknown_203B2E0->unk3C] = gUnknown_80DFC9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2E0->unk44, 1, 1);
sub_800641C(gUnknown_203B2E0->unk44, TRUE, TRUE);
MemoryFree(gUnknown_203B2E0);
gUnknown_203B2E0 = NULL;
}

8
src/wonder_mail_3.c
View File

@ -359,7 +359,7 @@ bool8 sub_802CDD4(u32 r0)
gUnknown_203B2F4->unk38->unk14 = gUnknown_203B2F4->unk9C;
sub_8012D34(gUnknown_203B2F4->unk38, 4);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2F4->unk3C, 1, 1);
sub_800641C(gUnknown_203B2F4->unk3C, TRUE, TRUE);
sub_8013848(&gUnknown_203B2F4->input, 5, 4, r0);
sub_802CF5C();
sub_802CFD0();
@ -405,7 +405,7 @@ u8 sub_802CEBC(void)
void sub_802CED8(u8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2F4->unk3C, 0, 0);
sub_800641C(gUnknown_203B2F4->unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_203B2F4->input);
sub_802CF5C();
sub_802CFD0();
@ -419,7 +419,7 @@ void sub_802CF14(void)
{
gUnknown_203B2F4->unk3C[gUnknown_203B2F4->unk34] = gUnknown_80DFD8C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2F4->unk3C, 1, 1);
sub_800641C(gUnknown_203B2F4->unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B2F4);
gUnknown_203B2F4 = NULL;
}
@ -613,7 +613,7 @@ void sub_802D1B8(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2F8->unk1A8, 1, 1);
sub_800641C(gUnknown_203B2F8->unk1A8, TRUE, TRUE);
}
void sub_802D2A8(void)

10
src/wonder_mail_3_mid.c
View File

@ -324,7 +324,7 @@ void sub_802F004(void)
}
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B30C->unkF0, 1, 1);
sub_800641C(gUnknown_203B30C->unkF0, TRUE, TRUE);
}
void sub_802F088(void)
@ -433,7 +433,7 @@ u32 sub_802F204(struct unkStruct_802F204 *r0, bool8 displayClientSprite)
struct unkStruct_203B310 *preload;
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B310 = MemoryAlloc(sizeof(struct unkStruct_203B310), 8);
gUnknown_203B310->unk10 = r0;
gUnknown_203B310->itemRewardIndex = 0;
@ -507,7 +507,7 @@ void sub_802F300(void)
gUnknown_203B310->unk24[index] = gUnknown_80E041C;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B310->unk24, 1, 1);
sub_800641C(gUnknown_203B310->unk24, TRUE, TRUE);
default:
break;
}
@ -721,7 +721,7 @@ u32 sub_802F73C(u32 r0, struct UnkTextStruct2_sub *r1, u32 r2, u8 r3)
sub_8012D08(gUnknown_203B314->unkF4, r2);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B314->unkF8, 1, 1);
sub_800641C(gUnknown_203B314->unkF8, TRUE, TRUE);
sub_8013818(&gUnknown_203B314->input, sub_802FBF4(), r2, r0);
sub_802F9C0();
sub_802FA50();
@ -801,7 +801,7 @@ void sub_802F974(void)
{
gUnknown_203B314->unkF8[gUnknown_203B314->unkF0] = gUnknown_80E06FC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B314->unkF8, 1, 1);
sub_800641C(gUnknown_203B314->unkF8, TRUE, TRUE);
MemoryFree(gUnknown_203B314);
gUnknown_203B314 = NULL;
}

4
src/wonder_mail_4.c
View File

@ -103,7 +103,7 @@ u32 sub_80306A8(u32 wonderMailType, u32 r1, struct UnkTextStruct2_sub *r2, u32 r
sub_8012D08(gUnknown_203B320->unk5C, r3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B320->unk60, 1, 1);
sub_800641C(gUnknown_203B320->unk60, TRUE, TRUE);
sub_8013818(&gUnknown_203B320->input, sub_8030A74(), r3, r1);
sub_80308A0();
sub_803092C();
@ -162,7 +162,7 @@ void sub_803084C()
{
gUnknown_203B320->unk60[gUnknown_203B320->unk58] = gUnknown_80E083C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B320->unk60, 1, 1);
sub_800641C(gUnknown_203B320->unk60, TRUE, TRUE);
MemoryFree(gUnknown_203B320);
gUnknown_203B320 = NULL;
}

4
src/wonder_mail_5.c
View File

@ -95,7 +95,7 @@ void sub_8030DE4(void)
{
gUnknown_203B324->unk18[gUnknown_203B324->unk10] = gUnknown_80E0900;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B324->unk18, 1, 1);
sub_800641C(gUnknown_203B324->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B324);
gUnknown_203B324 = NULL;
}
@ -104,7 +104,7 @@ void sub_8030DE4(void)
void sub_8030E2C(void)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B324->unk18, 1, 1);
sub_800641C(gUnknown_203B324->unk18, TRUE, TRUE);
}
void sub_8030E48(void)

6
src/wonder_mail_6.c
View File

@ -99,7 +99,7 @@ bool8 sub_8030F58(u32 wonderMailType)
struct OpenedFile *file;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
if (gUnknown_203B328 == NULL) {
gUnknown_203B328 = MemoryAlloc(sizeof(struct unkStruct_203B328),8);
MemoryFill8((u8 *)gUnknown_203B328,0,sizeof(struct unkStruct_203B328));
@ -207,11 +207,11 @@ void sub_80310FC(void)
case 6:
default:
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_800641C(NULL, TRUE, TRUE);
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B328->unkA8, 1, 1);
sub_800641C(gUnknown_203B328->unkA8, TRUE, TRUE);
}
void sub_8031258(void)

8
src/wonder_mail_802DF88.c
View File

@ -137,7 +137,7 @@ bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon)
}
else {
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B2FC = MemoryAlloc(sizeof(struct unkStruct_203B2FC),8);
gUnknown_203B2FC->jobSlotIndex = jobSlotIndex;
gUnknown_203B2FC->jobInfo = GetJobSlotInfo(jobSlotIndex);
@ -209,7 +209,7 @@ void sub_802DC40(void)
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B2FC->unk48, 1, 1);
sub_800641C(gUnknown_203B2FC->unk48, TRUE, TRUE);
}
void sub_802DC9C(void)
@ -342,7 +342,7 @@ void sub_802DF24(void)
{
gUnknown_203B300->unk18[gUnknown_203B300->unk10] = gUnknown_80E0248;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B300->unk18, 1, 1);
sub_800641C(gUnknown_203B300->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B300);
gUnknown_203B300 = NULL;
}
@ -351,7 +351,7 @@ void sub_802DF24(void)
void sub_802DF6C(void)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B300->unk18, 1, 1);
sub_800641C(gUnknown_203B300->unk18, TRUE, TRUE);
}
void sub_802DF88(void)

10
src/wonder_mail_main_menu.c
View File

@ -181,7 +181,7 @@ bool8 CreateWonderMailMenu(void)
s32 index;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
gUnknown_203B3E8 = MemoryAlloc(sizeof(struct unkStruct_203B3E8), 8);
MemoryFill8((u8 *)gUnknown_203B3E8, 0, sizeof(struct unkStruct_203B3E8));
@ -417,7 +417,7 @@ void HandlePasswordEntryScreen(void)
case 3:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B3E8->unk1EC,1,1);
sub_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE);
if ( !DecodeWonderMailPassword(gUnknown_203B3E8->PasswordEntryBuffer, &gUnknown_203B3E8->UNK38.decodedMail) || !IsValidWonderMail(&gUnknown_203B3E8->UNK38.decodedMail) )
{
// Invalid password
@ -435,7 +435,7 @@ void HandlePasswordEntryScreen(void)
case 2:
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B3E8->unk1EC,1,1);
sub_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE);
SetWonderMailMainMenuState(EXIT_TO_MAIN_MENU);
break;
}
@ -542,7 +542,7 @@ void WonderMailMainMenuCallback(void)
break;
case 3:
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_802EF48();
break;
case RECEIVE_WONDER_MAIL_MAIN_SCREEN:
@ -646,7 +646,7 @@ void WonderMailMainMenuCallback(void)
case PASSWORD_ENTRY_SCREEN:
sub_8006518(gUnknown_203B3E8->unk1EC);
ResetUnusedInputStruct();
sub_800641C(0,1,1);
sub_800641C(NULL, TRUE, TRUE);
sub_80151C0(5,gUnknown_203B3E8->PasswordEntryBuffer);
break;
case PASSWORD_INVALID: