From 98a2014037e783224b165ee7f7858a94688ed809 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 26 Oct 2000 16:33:42 +0000
Subject: [PATCH]

---
 source/pad/pads.cpp | 32 ++++++++------------------------
 source/pad/pads.h   | 14 +++-----------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/source/pad/pads.cpp b/source/pad/pads.cpp
index 45fb73e3a..81ddfd79d 100644
--- a/source/pad/pads.cpp
+++ b/source/pad/pads.cpp
@@ -22,21 +22,13 @@ static sPadConfigTable	PadConfigDefault=
 	PAD_UP,				// PAD_CFG_UP
 	PAD_DOWN,			// PAD_CFG_DOWN
 
-	PAD_START,			// PAD_CFG_START
-	PAD_SELECT,			// PAD_CFG_SELECT
-
-	PAD_CIRCLE,			// PAD_CFG_KICK
-	PAD_CROSS,			// PAD_CFG_PUNCH
-	PAD_SQUARE,			// PAD_CFG_JUMP
-	PAD_TRIANGLE,		// PAD_CFG_BLOCK
-	PAD_L2,				// PAD_CFG_RUN
-	PAD_R2,				// PAD_CFG_SPECIAL
-	PAD_L1,				// PAD_CFG_STEPLEFT
-	PAD_R1				// PAD_CFG_STEPRIGHT
+	PAD_START,			// PAD_CFG_PAUSE,
+	PAD_CIRCLE,			// PAD_CFG_ACTION,
+	PAD_CROSS,			// PAD_CFG_JUMP,
 	}
 };
 
-static sPadConfigTable	BloodyOddPadConfigDefault=
+static sPadConfigTable	PadConfigAlternative=
 {
 	{
 	0,					// PAD_CFG_NONE
@@ -45,17 +37,9 @@ static sPadConfigTable	BloodyOddPadConfigDefault=
 	PAD_UP,				// PAD_CFG_UP
 	PAD_DOWN,			// PAD_CFG_DOWN
 
-	PAD_START,			// PAD_CFG_START
-	PAD_SELECT,			// PAD_CFG_SELECT
-
-	PAD_R2,				// PAD_CFG_KICK
-	PAD_R1,				// PAD_CFG_PUNCH
-	PAD_CROSS,			// PAD_CFG_JUMP
-	PAD_L1,				// PAD_CFG_BLOCK
-	PAD_SQUARE,			// PAD_CFG_RUN
-	PAD_L2,				// PAD_CFG_SPECIAL
-	PAD_TRIANGLE,		// PAD_CFG_STEPLEFT
-	PAD_CIRCLE			// PAD_CFG_STEPRIGHT
+	PAD_START,			// PAD_CFG_PAUSE,
+	PAD_CROSS,			// PAD_CFG_ACTION,
+	PAD_SQUARE,			// PAD_CFG_JUMP,
 	}
 };
 
@@ -437,7 +421,7 @@ bool	PadIsConnected(int port)
 sPadConfigTable *getPadConfigTable(int _padConfig)
 {
 	if(_padConfig==0)return &PadConfigDefault;
-	if(_padConfig==1)return &BloodyOddPadConfigDefault;
+	if(_padConfig==1)return &PadConfigAlternative;
 	ASSERT(0);
 	return &PadConfigDefault;
 }
diff --git a/source/pad/pads.h b/source/pad/pads.h
index a7c4582ec..5d37a43a4 100644
--- a/source/pad/pads.h
+++ b/source/pad/pads.h
@@ -112,17 +112,9 @@ enum	PAD_CFG
 	PAD_CFG_UP,
 	PAD_CFG_DOWN,
 
-	PAD_CFG_START,
-	PAD_CFG_SELECT,
-
-	PAD_CFG_KICK,		// CIRCLE
-	PAD_CFG_PUNCH,		// CROSS
-	PAD_CFG_JUMP,		// SQUARE
-	PAD_CFG_BLOCK,		// TRIANGLE
-	PAD_CFG_RUN,		// L2
-	PAD_CFG_SPECIAL,	// R2
-	PAD_CFG_STEPLEFT,	// L1
-	PAD_CFG_STEPRIGHT,	// R1
+	PAD_CFG_PAUSE,
+	PAD_CFG_ACTION,
+	PAD_CFG_JUMP,
 
 	PAD_CFG_MAX
 };