diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
commit | 6cb1c4fd6e7c52e528f36e3511ac4b4db4dbb2ee (patch) | |
tree | c5d4f93c251472daa4cded616da3141448a37e6b /include/gba | |
parent | 665734d689fbd6da708e482b1cb9fdf3ee2345bc (diff) | |
parent | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (diff) |
fix merge conflicts, evo scene
Diffstat (limited to 'include/gba')
-rw-r--r-- | include/gba/io_reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 83a2a123b..f86f2434c 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -628,6 +628,8 @@ #define KEY_OR_INTR 0x0000 #define KEY_AND_INTR 0x8000 +#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) + // interrupt flags #define INTR_FLAG_VBLANK (1 << 0) #define INTR_FLAG_HBLANK (1 << 1) |