diff options
Diffstat (limited to 'arm9/lib/include/registers.h')
| -rw-r--r-- | arm9/lib/include/registers.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index 06f96d5a..a5355322 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -1,7 +1,8 @@ -#ifndef POKEDIAMOND_REGISTERS_H -#define POKEDIAMOND_REGISTERS_H +#ifndef POKEDIAMOND_ARM9_REGISTERS_H +#define POKEDIAMOND_ARM9_REGISTERS_H #include "nitro/types.h" +#include "nitro/registers_shared.h" #define reg_GX_DISPCNT (*(REGType32v *)0x4000000) #define reg_GX_DISPSTAT (*(REGType16v *)0x4000004) @@ -103,9 +104,6 @@ #define reg_MI_MCCMD1 (*(REGType32v *)0x40001ac) #define reg_MI_EXMEMCNT (*(REGType16v *)0x4000204) -#define reg_OS_IME (*(REGType16v *)0x4000208) -#define reg_OS_IE (*(REGType32v *)0x4000210) -#define reg_OS_IF (*(REGType32v *)0x4000214) #define reg_OS_PAUSE (*(REGType16v *)0x4000300) #define reg_GX_VRAMCNT (*(REGType32v *)0x4000240) @@ -482,4 +480,4 @@ ((u32)(a) << REG_PAD_KEYCNT_A_SHIFT)) #endif -#endif //POKEDIAMOND_REGISTERS_H +#endif //POKEDIAMOND_ARM9_REGISTERS_H |