diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-07 21:55:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-07 20:55:59 -0700 |
| commit | 6eaf196927eb6c4465c3b6c8fcdcefb08a9bc377 (patch) | |
| tree | d519b46246312e8947507f840f39afbf06829216 /include/PR | |
| parent | 2e2b2e2c7a59bd3544de5e73f72a03b947ec8ab3 (diff) | |
Misc Clean (#1680)
* vramu32 in Overlay_Relocate
* Actor_SetColorFilter args
* Effect Hitmark enum
* Actor_WorldToActorCoords
* Some fault clean up
* contoller.h
* macros.h no longer needs stdint.h
Diffstat (limited to 'include/PR')
| -rw-r--r-- | include/PR/os_cont.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/PR/os_cont.h b/include/PR/os_cont.h index 50febb015..2deae976e 100644 --- a/include/PR/os_cont.h +++ b/include/PR/os_cont.h @@ -56,24 +56,6 @@ typedef struct { #define B_BUTTON 0x4000 #define A_BUTTON 0x8000 -/* Not original to libultra: button macros */ -/* Buttons */ -#define BTN_CRIGHT R_CBUTTONS -#define BTN_CLEFT L_CBUTTONS -#define BTN_CDOWN D_CBUTTONS -#define BTN_CUP U_CBUTTONS -#define BTN_R R_TRIG -#define BTN_L L_TRIG -#define BTN_RESET 0x0080 /* "neutral reset": Corresponds to holding L+R and pressing S */ -#define BTN_DRIGHT R_JPAD -#define BTN_DLEFT L_JPAD -#define BTN_DDOWN D_JPAD -#define BTN_DUP U_JPAD -#define BTN_START START_BUTTON -#define BTN_Z Z_TRIG -#define BTN_B B_BUTTON -#define BTN_A A_BUTTON - #define CONT_ERR_NO_CONTROLLER PFS_ERR_NOPACK /* 1 */ #define CONT_ERR_CONTRFAIL CONT_OVERRUN_ERROR /* 4 */ #define CONT_ERR_INVALID PFS_ERR_INVALID /* 5 */ |