16 files changed, 18 insertions, 9 deletions

diff --git a/hcl/data/midi/allclear.mid.ogg b/hcl/data/midi/allclear.mid.ogg
new file mode 100644
index 0000000..5965bed
--- /dev/null
+++ b/hcl/data/midi/allclear.mid.ogg
diff --git a/hcl/data/midi/boss.mid.ogg b/hcl/data/midi/boss.mid.ogg
new file mode 100644
index 0000000..1ae66a5
--- /dev/null
+++ b/hcl/data/midi/boss.mid.ogg
diff --git a/hcl/data/midi/clear.mid.ogg b/hcl/data/midi/clear.mid.ogg
new file mode 100644
index 0000000..3654893
--- /dev/null
+++ b/hcl/data/midi/clear.mid.ogg
diff --git a/hcl/data/midi/ending.mid.ogg b/hcl/data/midi/ending.mid.ogg
new file mode 100644
index 0000000..dbde529
--- /dev/null
+++ b/hcl/data/midi/ending.mid.ogg
diff --git a/hcl/data/midi/gameover.mid.ogg b/hcl/data/midi/gameover.mid.ogg
new file mode 100644
index 0000000..bd66e46
--- /dev/null
+++ b/hcl/data/midi/gameover.mid.ogg
diff --git a/hcl/data/midi/init.mid.ogg b/hcl/data/midi/init.mid.ogg
new file mode 100644
index 0000000..6b94f26
--- /dev/null
+++ b/hcl/data/midi/init.mid.ogg
diff --git a/hcl/data/midi/lastboss.mid.ogg b/hcl/data/midi/lastboss.mid.ogg
new file mode 100644
index 0000000..d2d72a8
--- /dev/null
+++ b/hcl/data/midi/lastboss.mid.ogg
diff --git a/hcl/data/midi/main01.mid.ogg b/hcl/data/midi/main01.mid.ogg
new file mode 100644
index 0000000..32f8ce8
--- /dev/null
+++ b/hcl/data/midi/main01.mid.ogg
diff --git a/hcl/data/midi/main02.mid.ogg b/hcl/data/midi/main02.mid.ogg
new file mode 100644
index 0000000..f8cf58a
--- /dev/null
+++ b/hcl/data/midi/main02.mid.ogg
diff --git a/hcl/data/midi/main03.mid.ogg b/hcl/data/midi/main03.mid.ogg
new file mode 100644
index 0000000..e0001d0
--- /dev/null
+++ b/hcl/data/midi/main03.mid.ogg
diff --git a/hcl/data/midi/main04.mid.ogg b/hcl/data/midi/main04.mid.ogg
new file mode 100644
index 0000000..44cd8c7
--- /dev/null
+++ b/hcl/data/midi/main04.mid.ogg
diff --git a/hcl/data/midi/main05.mid.ogg b/hcl/data/midi/main05.mid.ogg
new file mode 100644
index 0000000..d650fbe
--- /dev/null
+++ b/hcl/data/midi/main05.mid.ogg
diff --git a/hcl/data/midi/main06.mid.ogg b/hcl/data/midi/main06.mid.ogg
new file mode 100644
index 0000000..84acdab
--- /dev/null
+++ b/hcl/data/midi/main06.mid.ogg
diff --git a/hcl/data/midi/nazo.mid.ogg b/hcl/data/midi/nazo.mid.ogg
new file mode 100644
index 0000000..7c8a913
--- /dev/null
+++ b/hcl/data/midi/nazo.mid.ogg
diff --git a/hcl/data/midi/start.mid.ogg b/hcl/data/midi/start.mid.ogg
new file mode 100644
index 0000000..38b5d72
--- /dev/null
+++ b/hcl/data/midi/start.mid.ogg
diff --git a/src/sdl/input.c b/src/sdl/input.c
index 662b85b..3036987 100644
--- a/src/sdl/input.c
+++ b/src/sdl/input.c
@@ -42,6 +42,15 @@ void Input_CloseJoystick()
 	joy1 = NULL;
 }
 
+#define BTN_X			SDLK_SPACE
+#define BTN_A			SDLK_LCTRL
+#define BTN_B			SDLK_LALT
+#define BTN_Y			SDLK_LSHIFT
+#define BTN_L			SDLK_TAB
+#define BTN_R			SDLK_BACKSPACE
+#define BTN_START		SDLK_RETURN
+#define BTN_SELECT		SDLK_ESCAPE
+
 void Input_KeyEvent(SDL_Event* evt)
 {
     int w = (evt->type==SDL_KEYDOWN)?1:0;
@@ -70,14 +79,14 @@ void Input_KeyEvent(SDL_Event* evt)
 		case SDLK_SPACE:        bSelect = w; break;
 		case SDLK_RETURN:       bStart = w; break;
 #elif defined(DINGUX)
-		case SDLK_LSHIFT:        bFaceUp = w; break;
-        case SDLK_LALT:        bFaceDown = w; break;
-        case SDLK_LCTRL:        	bFaceLeft = w; break;
-		case SDLK_SPACE:       bFaceRight = w; break;
-		case SDLK_BACKSPACE:            bR = w; break;
-		case SDLK_TAB:            bL = w; break;
-		case SDLK_ESCAPE:        bSelect = w; break;
-		case SDLK_RETURN:       bStart = w; break;
+		case BTN_X:        bFaceUp = w; break;
+        case BTN_B:        bFaceDown = w; break;
+        case BTN_Y:        bFaceLeft = w; break;
+		case BTN_A:        bFaceRight = w; break;
+		case BTN_R:        bR = w; break;
+		case BTN_L:        bL = w; break;
+		case BTN_START:    bSelect = w; break;
+		case BTN_SELECT:   bStart = w; break;
 #else
         case SDLK_e:        bFaceUp = w; break;
         case SDLK_x:        bFaceDown = w; break;
@@ -203,6 +212,6 @@ void PHL_ScanInput()
 	updateKey(&btnFaceDown, bFaceDown|jFaceDown);
 	updateKey(&btnFaceRight, bFaceRight|jFaceRight);
 	
-	updateKey(&btnAccept, bFaceLeft|jFaceLeft);
+	updateKey(&btnAccept, bFaceLeft|jFaceLeft|bFaceRight|bFaceRight);
 	updateKey(&btnDecline, bFaceDown|jFaceDown);
 }