diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-01 09:53:07 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-01 09:53:07 -0400 |
| commit | 85a668f75a799b50d4a7d77ecb292735bcce76b2 (patch) | |
| tree | 6b9962f8151412cc9c19d456e50d10fd34739be7 /arm9/lib/include/registers.h | |
| parent | 115ea6a6f5e7c6ccc190131e44c872dc075a25cb (diff) | |
| parent | 138893481737a0d057a86dad8ed5181e0ade92d6 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include/registers.h')
| -rw-r--r-- | arm9/lib/include/registers.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index 37ca97e6..6bfb52ac 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -454,6 +454,19 @@ #define REG_PAD_KEYCNT_A_SIZE 1 #define REG_PAD_KEYCNT_A_MASK 0x0001 +#define REG_G2_WINOUT_OBJWININ_SHIFT 8 +#define REG_G2_WINOUT_OBJWININ_SIZE 6 +#define REG_G2_WINOUT_OBJWININ_MASK 0x3f00 + +#define REG_G2_WINOUT_WINOUT_SHIFT 0 +#define REG_G2_WINOUT_WINOUT_SIZE 6 +#define REG_G2_WINOUT_WINOUT_MASK 0x003f + +#define REG_G2_WINOUT_FIELD( objwinin, winout ) \ + (u16)( \ + ((u32)(objwinin) << REG_G2_WINOUT_OBJWININ_SHIFT) | \ + ((u32)(winout) << REG_G2_WINOUT_WINOUT_SHIFT)) + #ifndef SDK_ASM #define REG_PAD_KEYCNT_FIELD( logic, intr, l, r, down, up, left, right, start, sel, b, a ) \ (u16)( \ |