Merge branch 'master' into new_blit

src/console.c

@@ -852,6 +852,13 @@ static void onConsoleSurfCommand(Console* console, const char* param)
 	commandDone(console);
 }
 
+static void onConsoleCodeCommand(Console* console, const char* param)
+{
+	gotoCode();
+	commandDone(console);
+}
+
+
 static void onConsoleKeymapCommand(Console* console, const char* param)
 {
 	setStudioMode(TIC_KEYMAP_MODE);
@@ -1840,6 +1847,7 @@ static const struct
 	{"config",	NULL, "edit TIC config",			onConsoleConfigCommand},
 	{"keymap",	NULL, "configure keyboard mapping",	onConsoleKeymapCommand},
 	{"version",	NULL, "show the current version",	onConsoleVersionCommand},
+	{"edit",	NULL, "open cart editor",			onConsoleCodeCommand},
 	{"surf",	NULL, "open carts browser",			onConsoleSurfCommand},
 };
 

src/studio.c

@@ -721,6 +721,11 @@ void gotoSurf()
 	setStudioMode(TIC_SURF_MODE);
 }
 
+void gotoCode()
+{
+	setStudioMode(TIC_CODE_MODE);
+}
+
 static void initMenuMode()
 {
 	initMenu(&studio.menu, studio.tic, studio.fs);

src/studio.h

@@ -189,6 +189,7 @@ bool studioCartChanged();
 void playSystemSfx(s32 id);
 
 void runGameFromSurf();
+void gotoCode();
 void gotoSurf();
 void exitFromGameMenu();
 void runProject();