diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-10-11 09:03:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 09:03:17 -0700 |
| commit | 25794a39c3539e66d1c0b2334cb35273cd9d8494 (patch) | |
| tree | 43ca3a658e80672844b2906b8cbe151ed70c3621 /src/code_2.c | |
| parent | 2d4c802d769f53462a2742a5c6afaad4d7f290fb (diff) | |
Finish main menu decomp (#59)
* decomp rest of main_menu
* move some main menu data over
* decomp some more wonder mail
* decomp the dungeon dialogue scene switches
* more wonder mail
* consolidate struct_802F204
* another wonder mail func
* more wonder mail
* slight cleanup
Diffstat (limited to 'src/code_2.c')
| -rw-r--r-- | src/code_2.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/code_2.c b/src/code_2.c index 9ed43f9..c26b20b 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -6,6 +6,7 @@ #include "friend_area.h" #include "input.h" #include "memory.h" +#include "main_menu.h" #include "music.h" #include "play_time.h" #include "save.h" @@ -41,12 +42,6 @@ extern void sub_800CDA8(u32); extern void LoadTitleScreen(void); extern void SetBGPaletteBufferColorRGB(s32, u8 *, s32, u8 *); extern void sub_80095CC(u32, u32); -extern void InitMainMenu(void); -extern bool8 sub_80363E0(void); -extern void SetUpMenu(void); -extern u32 UpdateMenu(void); -extern void CleanUpMenu(void); -extern void DeleteMainMenu(void); extern s32 sub_80953D4(u32); extern void sub_8095240(u8); extern void nullsub_33(void); @@ -168,7 +163,7 @@ void GameLoop(void) CleanUpMenu(); if (nextMenu == 2) break; if (nextMenu == 4) break; - if (nextMenu == 3) break; + if (nextMenu == MENU_NEW_GAME) break; } DeleteMainMenu(); while (gUnknown_2000A80 > 0) { @@ -193,7 +188,7 @@ void GameLoop(void) case 4: tmp3 = sub_80009D0(3); break; - case 3: + case MENU_NEW_GAME: sub_80122A8(); nullsub_33(); tmp3 = sub_80009D0(0); |