From 1e838c773c58ef3b203c17370e5bc90f48bdfacb Mon Sep 17 00:00:00 2001
From: chaoskagami <chaos.kagami@gmail.com>
Date: Tue, 14 Jun 2016 01:39:41 -0400
Subject: [PATCH] A bit more cleanup and finetuning

---
 contrib/Makefile |  4 ++--
 source/config.h  | 12 +++---------
 source/menu.c    |  4 +---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/contrib/Makefile b/contrib/Makefile
index d41aaaf..a5db11c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -8,8 +8,8 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco))
 
 .PHONY: install
 install: build
-	mkdir -p ../out/contrib
-	cp *.vco ../out/contrib/
+	mkdir -p ../out/corbenik/contrib
+	cp *.vco README.md ../out/corbenik/contrib/
 
 %.vco: %.pco
 	../host/bytecode_asm.py $< $@
diff --git a/source/config.h b/source/config.h
index 9c9b0e0..1a8f58f 100644
--- a/source/config.h
+++ b/source/config.h
@@ -61,7 +61,7 @@ struct options_s
 // Inject svc calls (including backdoor for 11)
 #define OPTION_SVCS 3
 
-// Use builtin ARM9 thread injector.
+// Use builtin ARM9 thread injector. (NYI)
 #define OPTION_ARM9THREAD 4
 
 // Skip menu unless L is held.
@@ -73,14 +73,8 @@ struct options_s
 // Pause for A key on each step.
 #define OPTION_TRACE 7
 
-// Background color is not drawn under text.
-#define OPTION_TRANSP_BG 8
-
-// Framebuffer is preserved from whatever ran before us.
-#define OPTION_NO_CLEAR_BG 9
-
-// Remove Help/Readme from menu.
-#define OPTION_READ_ME 10
+// Freed up options due to code changes.
+// 8, 9, 10
 
 // Enable L2 cache.
 #define OPTION_LOADER_CPU_L2 11
diff --git a/source/menu.c b/source/menu.c
index 6bb11e3..f00c217 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -22,8 +22,6 @@ static struct options_s options[] = {
     { OPTION_AUTOBOOT, "Autoboot", "Boot the system automatically, unless the R key is held.", boolean_val, 0, 0 },
     { OPTION_SILENCE, "  Silent mode", "Suppress all debug output during autoboot. You'll see the screen turn on, then off.", boolean_val, 0, 0 },
 
-    { OPTION_READ_ME, "Hide `Help`", "Hides the help option from the main menu.", boolean_val, 0, 0 },
-
     // space
     { 0, "", "", not_option, 0, 0 },
     // Patches.
@@ -65,7 +63,7 @@ extern void waitcycles(uint32_t cycles);
 uint32_t
 wait_key()
 {
-    #define ARM9_APPROX_DELAY_MAX 134058675 / 70
+    #define ARM9_APPROX_DELAY_MAX 134058675 / 85
     waitcycles(ARM9_APPROX_DELAY_MAX); // Approximately what a human can input - fine tuning needed (sorry, TASers!)
 
     uint32_t ret = 0, get = 0;
-- 
2.39.5