diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-06 19:54:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 19:54:55 -0400 |
| commit | 7bd2d6636ba5a34fb0ae984f377f690d51ba97f0 (patch) | |
| tree | 01fc80ba55174953e92111f219d1aef07bffb39d /arm9/lib/include/consts.h | |
| parent | d821fc7b1346576fd88d8ee0fd38ec36a2cd8305 (diff) | |
| parent | 1aa4ae38b610ec5f7527444b9b0386334333679b (diff) | |
Merge pull request #68 from red031000/master
registers
Diffstat (limited to 'arm9/lib/include/consts.h')
| -rw-r--r-- | arm9/lib/include/consts.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h index c37d6269..b99b4148 100644 --- a/arm9/lib/include/consts.h +++ b/arm9/lib/include/consts.h @@ -6,6 +6,7 @@ #define POKEDIAMOND_CONSTS_H #include "mmap.h" +#include "registers.h" #define HW_PSR_CPU_MODE_MASK 0x1f // CPU mode @@ -13,19 +14,6 @@ #define HW_PSR_DISABLE_IRQ 0x80 // Disable IRQ #define HW_PSR_DISABLE_IRQ_FIQ 0xc0 // Disable FIQ and IRQ -#define HW_REG_BASE 0x04000000 -#define REG_VCOUNT_OFFSET 0x006 -#define REG_VCOUNT_ADDR (HW_REG_BASE + REG_VCOUNT_OFFSET) -#define reg_GX_VCOUNT (*(REGType16v *)REG_VCOUNT_ADDR) - -#define REG_KEYINPUT_OFFSET 0x130 -#define REG_KEYINPUT_ADDR (HW_REG_BASE + REG_KEYINPUT_OFFSET) -#define reg_PAD_KEYINPUT (*(REGType16v *)REG_KEYINPUT_ADDR) - -#define REG_GXSTAT_OFFSET 0x600 -#define REG_GXSTAT_ADDR (HW_REG_BASE + REG_GXSTAT_OFFSET) -#define reg_G3X_GXSTAT (*(REGType32v *)REG_GXSTAT_ADDR) - #define HW_C6_PR_4KB 0x16 #define HW_C6_PR_8KB 0x18 #define HW_C6_PR_16KB 0x1a |