summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stummvoll <michael@stummi.org>2010-11-24 11:39:40 +0000
committerMichael Stummvoll <michael@stummi.org>2010-11-24 11:39:40 +0000
commit72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd (patch)
treea953173e09afc2a187234a6054c573fc2634e785
parent681302171b76239f13962b7f747768335c333888 (diff)
downloadrockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.zip
rockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.tar.gz
rockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.tar.bz2
rockbox-72b4c4ff3bc2ff90f922a7a522aad74a5d0310cd.tar.xz
Adding an reset option to the rockboy menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28655 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/rockboy/menu.c9
-rw-r--r--manual/plugins/rockboy.tex1
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index ab27f3d..8139437 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -11,6 +11,7 @@
#include "save.h"
#include "rtc-gb.h"
#include "pcm.h"
+#include "emu.h"
#define SLOT_COUNT 50
#define DESC_SIZE 20
@@ -89,7 +90,7 @@ int do_user_menu(void) {
MENUITEM_STRINGLIST(menu, "Rockboy Menu", NULL,
"Load Game", "Save Game",
- "Options", "Quit");
+ "Options", "Reset", "Quit");
rockboy_pcm_init();
@@ -108,7 +109,11 @@ int do_user_menu(void) {
case 2: /* Options */
do_opt_menu();
break;
- case 3: /* Quit */
+ case 3: /* Reset */
+ emu_reset();
+ done=true;
+ break;
+ case 4: /* Quit */
ret = USER_MENU_QUIT;
done=true;
break;
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 479fbdb..e1d7578 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -122,5 +122,6 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
Pick one of a few predefined colour palettes.
}
\end{description}
+\item[Reset.] Resets the Emulator.
\item[Quit RockBoy.] Quits the Rockboy plugin.
\end{description}