diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-15 21:13:30 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-15 21:13:30 -0700 |
| commit | 1879d0883eabde11644db73cc070ce4bca8b0de5 (patch) | |
| tree | 902ee4257ba0e68dd73945123079a296127c168b /include | |
| parent | 147c8672c3be861fa9229c775c37933a39900b9c (diff) | |
main.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/io_reg.h | 19 | ||||
| -rw-r--r-- | include/global.h | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 9673cd0ef..84c136465 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -421,6 +421,9 @@ #define REG_TM3CNT_L (*(vu16 *)REG_ADDR_TM3CNT_L) #define REG_TM3CNT_H (*(vu16 *)REG_ADDR_TM3CNT_H) +#define REG_KEYINPUT (*(vu16 *)REG_ADDR_KEYINPUT) +#define REG_KEYCNT (*(vu16 *)REG_ADDR_KEYCNT) + #define REG_IME (*(vu16 *)REG_ADDR_IME) #define REG_IE (*(vu16 *)REG_ADDR_IE) #define REG_IF (*(vu16 *)REG_ADDR_IF) @@ -502,6 +505,22 @@ #define TIMER_INTR_ENABLE 0x40 #define TIMER_ENABLE 0x80 +// keys +#define A_BUTTON 0x0001 +#define B_BUTTON 0x0002 +#define SELECT_BUTTON 0x0004 +#define START_BUTTON 0x0008 +#define DPAD_RIGHT 0x0010 +#define DPAD_LEFT 0x0020 +#define DPAD_UP 0x0040 +#define DPAD_DOWN 0x0080 +#define R_BUTTON 0x0100 +#define L_BUTTON 0x0200 +#define KEYS_MASK 0x03FF +#define KEY_INTR_ENABLE 0x0400 +#define KEY_OR_INTR 0x0000 +#define KEY_AND_INTR 0x8000 + // interrupt flags #define INTR_FLAG_VBLANK (1 << 0) #define INTR_FLAG_HBLANK (1 << 1) diff --git a/include/global.h b/include/global.h index 8987fdf6a..79c9e771f 100644 --- a/include/global.h +++ b/include/global.h @@ -35,7 +35,8 @@ struct SaveBlock2 u8 playTimeMinutes; u8 playTimeSeconds; u8 playTimeVBlanks; - u8 filler[0x85]; + u8 optionsButtonMode; + u8 filler[0x84]; struct Time localTimeOffset; }; |