From f2165154c28a16af14ef1dc3ffcf6541c9b601d4 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 9 Jul 2023 20:17:37 -0700 Subject: [PATCH] nit: forgot another MenuInputStruct --- include/code_801EE10.h | 5 +---- src/code_801EE10.c | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/code_801EE10.h b/include/code_801EE10.h index 1e0c93ec1..b6ff7142e 100644 --- a/include/code_801EE10.h +++ b/include/code_801EE10.h @@ -13,10 +13,7 @@ struct unkStruct_203B270 /* 0xC */ u8 isTeamLeader; /* 0x10 */ struct Move *moves; u8 fill14[0x1C - 0x14]; - u32 unk1C; - u8 fill20[0x36 - 0x20]; - s16 unk36; - u8 fill38[0x50 - 0x38]; + struct MenuInputStruct input; u32 unk50; u32 unk54; struct UnkTextStruct2 unk58[4]; diff --git a/src/code_801EE10.c b/src/code_801EE10.c index e7f5e704e..ea6e5a000 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -13,7 +13,7 @@ extern void sub_8012D08(void *, u32); extern void sub_8013818(void *, u32, u32, u32); u32 sub_8006544(u32 index); s32 sub_801F3F8(void); -void sub_8013780(u32 *, u32); +void sub_8013780(struct MenuInputStruct*, u32); void sub_801F280(u32); u8 sub_801EE10(u32 param_1,s16 species,struct Move *moves,u32 param_4,u8 *param_5,u32 param_6) @@ -63,8 +63,8 @@ u8 sub_801EE10(u32 param_1,s16 species,struct Move *moves,u32 param_4,u8 *param_ sub_8012D08(&gUnknown_203B270->unk58[gUnknown_203B270->unk50],iVar8); ResetUnusedInputStruct(); sub_800641C(gUnknown_203B270->unk58,1,1); - sub_8013818(&gUnknown_203B270->unk1C,iVar5,iVar5,param_6); - sub_8013780(&gUnknown_203B270->unk1C,0); + sub_8013818(&gUnknown_203B270->input,iVar5,iVar5,param_6); + sub_8013780(&gUnknown_203B270->input,0); sub_801F280(1); return 1; }