diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 22:03:02 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 22:03:02 -0500 |
| commit | de302527c3eb7fae0c09236b6d405ea64f579845 (patch) | |
| tree | b692c7e99ed61fd558f59feed5a77f768cb05744 /src/scene/title_screen.c | |
| parent | 08a79136313ec5d82d1e62f3c9bcd2c9967a9e89 (diff) | |
| parent | 28987bb1cd0e6864257ff0434508dddcddb22e98 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into evobjmv
Diffstat (limited to 'src/scene/title_screen.c')
| -rw-r--r-- | src/scene/title_screen.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 202b752a6..a1c8e081d 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -8,6 +8,7 @@ #include "m4a.h" #include "main.h" #include "main_menu.h" +#include "overworld.h" #include "palette.h" #include "reset_rtc_screen.h" #include "sound.h" @@ -353,6 +354,9 @@ static void Task_TitleScreenPhase1(u8); static void Task_TitleScreenPhase2(u8); static void Task_TitleScreenPhase3(u8); static void CB2_GoToMainMenu(void); +#if DEBUG +static void CB2_GoToTestMenu(void); +#endif static void CB2_GoToClearSaveDataScreen(void); static void CB2_GoToResetRtcScreen(void); static void CB2_GoToCopyrightScreen(void); @@ -829,6 +833,13 @@ static void Task_TitleScreenPhase3(u8 taskId) BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); SetMainCallback2(CB2_GoToResetRtcScreen); } +#if DEBUG + else if (gMain.heldKeys == SELECT_BUTTON) + { + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + SetMainCallback2(CB2_GoToTestMenu); + } +#endif else { REG_BG2Y = 0; @@ -855,6 +866,14 @@ static void CB2_GoToMainMenu(void) SetMainCallback2(CB2_InitMainMenu); } +#if DEBUG +static void CB2_GoToTestMenu(void) +{ + if (!UpdatePaletteFade()) + SetMainCallback2(CB2_InitTestMenu); +} +#endif + static void CB2_GoToCopyrightScreen(void) { if (!UpdatePaletteFade()) |