diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-06 10:17:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-06 10:17:48 -0400 |
| commit | 287997378d2531af6c610721f2be2424ca4cbfa3 (patch) | |
| tree | a52d852aeac6ea91103dc5b4ce9dad2fee375bc6 /arm9/lib/include/consts.h | |
| parent | 3e3328342369ac8143a442c5b85ad56ce587b195 (diff) | |
| parent | cae6ef601c8d2892c078eb77327e4552f3c8bf64 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include/consts.h')
| -rw-r--r-- | arm9/lib/include/consts.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arm9/lib/include/consts.h b/arm9/lib/include/consts.h index b99b4148..6c83bce8 100644 --- a/arm9/lib/include/consts.h +++ b/arm9/lib/include/consts.h @@ -1,19 +1,10 @@ -// -// Created by mart on 4/15/20. -// - -#ifndef POKEDIAMOND_CONSTS_H -#define POKEDIAMOND_CONSTS_H +#ifndef POKEDIAMOND_ARM9_CONSTS_H +#define POKEDIAMOND_ARM9_CONSTS_H +#include "nitro/consts_shared.h" #include "mmap.h" #include "registers.h" -#define HW_PSR_CPU_MODE_MASK 0x1f // CPU mode - -#define HW_PSR_DISABLE_FIQ 0x40 // Disable FIQ -#define HW_PSR_DISABLE_IRQ 0x80 // Disable IRQ -#define HW_PSR_DISABLE_IRQ_FIQ 0xc0 // Disable FIQ and IRQ - #define HW_C6_PR_4KB 0x16 #define HW_C6_PR_8KB 0x18 #define HW_C6_PR_16KB 0x1a @@ -53,4 +44,4 @@ #define OS_IE_V_BLANK (1UL << 0) -#endif //POKEDIAMOND_CONSTS_H +#endif //POKEDIAMOND_ARM9_CONSTS_H |