rename/reorder inputs

This commit is contained in:
thecozies 2024-03-03 14:06:34 -06:00
parent c8333056ba
commit 02adf1b5f2

View File

@ -13,26 +13,26 @@ namespace recomp {
// x-macros to build input enums and arrays. // x-macros to build input enums and arrays.
// First parameter is the enum name, second parameter is the bit field for the input (or 0 if there is no associated one), third is the readable name. // First parameter is the enum name, second parameter is the bit field for the input (or 0 if there is no associated one), third is the readable name.
#define DEFINE_N64_BUTTON_INPUTS() \ #define DEFINE_N64_BUTTON_INPUTS() \
DEFINE_INPUT(A, 0x8000, "A Button") \ DEFINE_INPUT(A, 0x8000, "Action") \
DEFINE_INPUT(B, 0x4000, "B Button") \ DEFINE_INPUT(B, 0x4000, "Attack/Cancel") \
DEFINE_INPUT(Z, 0x2000, "Z Button") \ DEFINE_INPUT(Z, 0x2000, "Target") \
DEFINE_INPUT(START, 0x1000, "Start Button") \ DEFINE_INPUT(START, 0x1000, "Start") \
DEFINE_INPUT(DPAD_UP, 0x0800, "Dpad Up") \ DEFINE_INPUT(L, 0x0020, "Toggle map") \
DEFINE_INPUT(DPAD_DOWN, 0x0400, "Dpad Down") \ DEFINE_INPUT(R, 0x0010, "Shield") \
DEFINE_INPUT(DPAD_LEFT, 0x0200, "Dpad Left") \ DEFINE_INPUT(C_UP, 0x0008, "Look/Fairy") \
DEFINE_INPUT(DPAD_RIGHT, 0x0100, "Dpad Right") \ DEFINE_INPUT(C_LEFT, 0x0002, "Item 1") \
DEFINE_INPUT(L, 0x0020, "L Button") \ DEFINE_INPUT(C_DOWN, 0x0004, "Item 2") \
DEFINE_INPUT(R, 0x0010, "R Button") \ DEFINE_INPUT(C_RIGHT, 0x0001, "Item 3") \
DEFINE_INPUT(C_UP, 0x0008, "C Up") \ DEFINE_INPUT(DPAD_UP, 0x0800, "Special Item 1") \
DEFINE_INPUT(C_DOWN, 0x0004, "C Down") \ DEFINE_INPUT(DPAD_RIGHT, 0x0100, "Special Item 2") \
DEFINE_INPUT(C_LEFT, 0x0002, "C Left") \ DEFINE_INPUT(DPAD_DOWN, 0x0400, "Special Item 3") \
DEFINE_INPUT(C_RIGHT, 0x0001, "C Right") DEFINE_INPUT(DPAD_LEFT, 0x0200, "Special Item 4")
#define DEFINE_N64_AXIS_INPUTS() \ #define DEFINE_N64_AXIS_INPUTS() \
DEFINE_INPUT(X_AXIS_NEG, 0, "Analog Left") \ DEFINE_INPUT(Y_AXIS_POS, 0, "Up") \
DEFINE_INPUT(X_AXIS_POS, 0, "Analog Right") \ DEFINE_INPUT(Y_AXIS_NEG, 0, "Down") \
DEFINE_INPUT(Y_AXIS_NEG, 0, "Analog Down") \ DEFINE_INPUT(X_AXIS_NEG, 0, "Left") \
DEFINE_INPUT(Y_AXIS_POS, 0, "Analog Up") \ DEFINE_INPUT(X_AXIS_POS, 0, "Right") \
#define DEFINE_ALL_INPUTS() \ #define DEFINE_ALL_INPUTS() \
DEFINE_N64_BUTTON_INPUTS() \ DEFINE_N64_BUTTON_INPUTS() \