summaryrefslogtreecommitdiff
path: root/src/main_menu_mid.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-03-30 13:11:51 -0500
committerGitHub <noreply@github.com>2021-03-30 13:11:51 -0500
commita2d206665c6fffbd962375f262b7fbb05c7b7478 (patch)
tree6710109c4d9098b74da68ca8f18024d6c184ebc2 /src/main_menu_mid.c
parent2fd4f339b42c010191c199772b09ac34c580de94 (diff)
Move some data and Splitting (#32)
* move friend area settings to src * split out playtime into different C file and decomp a few more funcs * time -> play_time * fix include * split out more wonder mail stuff * unify 203B2C0 and unkDungeon structs. snuck in a decomp func too * split out more menu screens * work some more on trade items * doc a few more things * add a close nonmatch and decomp nullsub and small func * rollback struct attempt since it causes nonmatchings * only one func left in asm * death to trade_item asm and unify into one C file * more docing and cleanup * label main menu and trade items menu global menu struct * doc itemMode
Diffstat (limited to 'src/main_menu_mid.c')
-rw-r--r--src/main_menu_mid.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main_menu_mid.c b/src/main_menu_mid.c
index ebe2abb..d606e4d 100644
--- a/src/main_menu_mid.c
+++ b/src/main_menu_mid.c
@@ -8,14 +8,14 @@ struct unkData
};
-extern struct MainMenu *gUnknown_203B348;
+extern struct MainMenu *gMainMenu;
extern struct unkData gUnknown_80E59A8;
-extern void sub_8006518();
+extern void sub_8006518(struct unkData *);
extern void sub_800641C(struct unkData *, u32, u32);
void sub_8035CC0(struct unkData *dataArray, u32 index)
{
- sub_8006518();
+ sub_8006518(dataArray);
dataArray[index] = gUnknown_80E59A8;
ResetUnusedInputStruct();
sub_800641C(dataArray, 1, 1);
@@ -46,35 +46,35 @@ void sub_8035CF4(void * Menu, u32 index, u8 r2)
void sub_8035D1C(void)
{
- gUnknown_203B348->unk38 = -1;
+ gMainMenu->unk38 = -1;
}
void sub_8035D30(s32 r0)
{
- gUnknown_203B348->unk38 = r0;
+ gMainMenu->unk38 = r0;
}
s16 sub_8035D3C(void)
{
- return gUnknown_203B348->unk38;
+ return gMainMenu->unk38;
}
s32 *sub_8035D4C(void)
{
- return &gUnknown_203B348->currMenu;
+ return &gMainMenu->currMenu;
}
void sub_8035D58(void)
{
- gUnknown_203B348->unk3C = -1;
+ gMainMenu->unk3C = -1;
}
void sub_8035D68(s32 r0)
{
- gUnknown_203B348->unk3C = r0;
+ gMainMenu->unk3C = r0;
}
s32 sub_8035D74(void)
{
- return gUnknown_203B348->unk3C;
+ return gMainMenu->unk3C;
}