Skip to content

Commit 8658023

Browse files
ExtremsExtrems
committed
Allow using TRIGGER_{L,R,Z} and BUTTON_{L,R,Z} interchangeably
1 parent 8ec50d7 commit 8658023

4 files changed

Lines changed: 64 additions & 52 deletions

File tree

‎include/ogc/n64.h‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,29 @@ distribution.
3030

3131
#include <gctypes.h>
3232

33-
#define N64_ERR_READY 0
34-
#define N64_ERR_NO_CONTROLLER -1
35-
#define N64_ERR_BUSY -2
36-
#define N64_ERR_TRANSFER -3
37-
38-
#define N64_BUTTON_RIGHT 0x0001
39-
#define N64_BUTTON_LEFT 0x0002
40-
#define N64_BUTTON_DOWN 0x0004
41-
#define N64_BUTTON_UP 0x0008
42-
#define N64_BUTTON_START 0x0010
43-
#define N64_BUTTON_Z 0x0020
44-
#define N64_BUTTON_B 0x0040
45-
#define N64_BUTTON_A 0x0080
46-
#define N64_BUTTON_C_RIGHT 0x0100
47-
#define N64_BUTTON_C_LEFT 0x0200
48-
#define N64_BUTTON_C_DOWN 0x0400
49-
#define N64_BUTTON_C_UP 0x0800
50-
#define N64_BUTTON_R 0x1000
51-
#define N64_BUTTON_L 0x2000
33+
#define N64_ERR_READY 0
34+
#define N64_ERR_NO_CONTROLLER -1
35+
#define N64_ERR_BUSY -2
36+
#define N64_ERR_TRANSFER -3
37+
38+
#define N64_BUTTON_RIGHT 0x0001
39+
#define N64_BUTTON_LEFT 0x0002
40+
#define N64_BUTTON_DOWN 0x0004
41+
#define N64_BUTTON_UP 0x0008
42+
#define N64_BUTTON_START 0x0010
43+
#define N64_BUTTON_Z 0x0020
44+
#define N64_BUTTON_B 0x0040
45+
#define N64_BUTTON_A 0x0080
46+
#define N64_BUTTON_C_RIGHT 0x0100
47+
#define N64_BUTTON_C_LEFT 0x0200
48+
#define N64_BUTTON_C_DOWN 0x0400
49+
#define N64_BUTTON_C_UP 0x0800
50+
#define N64_BUTTON_R 0x1000
51+
#define N64_BUTTON_L 0x2000
52+
53+
#define N64_TRIGGER_Z N64_BUTTON_Z
54+
#define N64_TRIGGER_R N64_BUTTON_R
55+
#define N64_TRIGGER_L N64_BUTTON_L
5256

5357
#ifdef __cplusplus
5458
extern "C" {

‎include/ogc/pad.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,20 @@
2828
#define PAD_BUTTON_RIGHT 0x0002
2929
#define PAD_BUTTON_DOWN 0x0004
3030
#define PAD_BUTTON_UP 0x0008
31-
#define PAD_TRIGGER_Z 0x0010
32-
#define PAD_TRIGGER_R 0x0020
33-
#define PAD_TRIGGER_L 0x0040
31+
#define PAD_BUTTON_Z 0x0010
32+
#define PAD_BUTTON_R 0x0020
33+
#define PAD_BUTTON_L 0x0040
3434
#define PAD_BUTTON_A 0x0100
3535
#define PAD_BUTTON_B 0x0200
3636
#define PAD_BUTTON_X 0x0400
3737
#define PAD_BUTTON_Y 0x0800
3838
#define PAD_BUTTON_MENU 0x1000
3939
#define PAD_BUTTON_START 0x1000
4040

41+
#define PAD_TRIGGER_Z PAD_BUTTON_Z
42+
#define PAD_TRIGGER_R PAD_BUTTON_R
43+
#define PAD_TRIGGER_L PAD_BUTTON_L
44+
4145
#define PADEX_STICK_LEFT (0x0001<<16)
4246
#define PADEX_STICK_RIGHT (0x0002<<16)
4347
#define PADEX_STICK_DOWN (0x0004<<16)

‎include/ogc/si_steering.h‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,37 @@ distribution.
3030

3131
#include <gctypes.h>
3232

33-
#define SI_STEERING_ERR_READY 0
34-
#define SI_STEERING_ERR_NO_CONTROLLER -1
35-
#define SI_STEERING_ERR_BUSY -2
36-
#define SI_STEERING_ERR_TRANSFER -3
37-
38-
#define SI_STEERING_STATUS_MTR_EN 0x01
39-
#define SI_STEERING_STATUS_MTR_BK 0x02
40-
#define SI_STEERING_STATUS_POWER 0x04
41-
#define SI_STEERING_STATUS_PEDAL 0x08
42-
43-
#define SI_STEERING_BUTTON_LEFT 0x0001
44-
#define SI_STEERING_BUTTON_RIGHT 0x0002
45-
#define SI_STEERING_BUTTON_DOWN 0x0004
46-
#define SI_STEERING_BUTTON_UP 0x0008
47-
#define SI_STEERING_TRIGGER_Z 0x0010
48-
#define SI_STEERING_TRIGGER_R 0x0020
49-
#define SI_STEERING_TRIGGER_L 0x0040
50-
#define SI_STEERING_BUTTON_A 0x0100
51-
#define SI_STEERING_BUTTON_B 0x0200
52-
#define SI_STEERING_BUTTON_X 0x0400
53-
#define SI_STEERING_BUTTON_Y 0x0800
54-
#define SI_STEERING_BUTTON_START 0x1000
55-
56-
#define SI_STEERING_CONTROL_BRAKE 0x000
57-
#define SI_STEERING_CONTROL_STANDBY 0x400
58-
#define SI_STEERING_CONTROL_DRIVE 0x600
59-
#define SI_STEERING_CONTROL_MASK 0x600
33+
#define SI_STEERING_ERR_READY 0
34+
#define SI_STEERING_ERR_NO_CONTROLLER -1
35+
#define SI_STEERING_ERR_BUSY -2
36+
#define SI_STEERING_ERR_TRANSFER -3
37+
38+
#define SI_STEERING_BUTTON_LEFT 0x0001
39+
#define SI_STEERING_BUTTON_RIGHT 0x0002
40+
#define SI_STEERING_BUTTON_DOWN 0x0004
41+
#define SI_STEERING_BUTTON_UP 0x0008
42+
#define SI_STEERING_BUTTON_Z 0x0010
43+
#define SI_STEERING_BUTTON_R 0x0020
44+
#define SI_STEERING_BUTTON_L 0x0040
45+
#define SI_STEERING_BUTTON_A 0x0100
46+
#define SI_STEERING_BUTTON_B 0x0200
47+
#define SI_STEERING_BUTTON_X 0x0400
48+
#define SI_STEERING_BUTTON_Y 0x0800
49+
#define SI_STEERING_BUTTON_START 0x1000
50+
51+
#define SI_STEERING_TRIGGER_Z SI_STEERING_BUTTON_Z
52+
#define SI_STEERING_TRIGGER_R SI_STEERING_BUTTON_R
53+
#define SI_STEERING_TRIGGER_L SI_STEERING_BUTTON_L
54+
55+
#define SI_STEERING_STATUS_MTR_EN 0x01
56+
#define SI_STEERING_STATUS_MTR_BK 0x02
57+
#define SI_STEERING_STATUS_POWER 0x04
58+
#define SI_STEERING_STATUS_PEDAL 0x08
59+
60+
#define SI_STEERING_CONTROL_BRAKE 0x000
61+
#define SI_STEERING_CONTROL_STANDBY 0x400
62+
#define SI_STEERING_CONTROL_DRIVE 0x600
63+
#define SI_STEERING_CONTROL_MASK 0x600
6064

6165
#ifdef __cplusplus
6266
extern "C" {

‎libogc/pad.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,9 +936,9 @@ u32 PAD_ScanPads(void)
936936
if(n64status.button&N64_BUTTON_RIGHT) state |= PAD_BUTTON_RIGHT;
937937
if(n64status.button&N64_BUTTON_DOWN) state |= PAD_BUTTON_DOWN;
938938
if(n64status.button&N64_BUTTON_UP) state |= PAD_BUTTON_UP;
939-
if(n64status.button&N64_BUTTON_Z) state |= PAD_TRIGGER_Z;
940-
if(n64status.button&N64_BUTTON_R) state |= PAD_TRIGGER_R | PADEX_TRIGGER_R;
941-
if(n64status.button&N64_BUTTON_L) state |= PAD_TRIGGER_L | PADEX_TRIGGER_L;
939+
if(n64status.button&N64_TRIGGER_Z) state |= PAD_TRIGGER_Z;
940+
if(n64status.button&N64_TRIGGER_R) state |= PAD_TRIGGER_R | PADEX_TRIGGER_R;
941+
if(n64status.button&N64_TRIGGER_L) state |= PAD_TRIGGER_L | PADEX_TRIGGER_L;
942942
if(n64status.button&N64_BUTTON_A) state |= PAD_BUTTON_A;
943943
if(n64status.button&N64_BUTTON_B) state |= PAD_BUTTON_B;
944944
if(n64status.button&N64_BUTTON_START) state |= PAD_BUTTON_START;

0 commit comments

Comments
 (0)