diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-29 12:46:15 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-29 12:46:15 -0600 |
| commit | 2fb9f490fbf961ff737c897c025ce1f5a54b2639 (patch) | |
| tree | 324168e2fdd9b4f68313d96eca433b673096c505 /include/gba | |
| parent | 146ad2bdd4e1c05d3a495e1da0dae719f4405630 (diff) | |
Almost done with trade
Diffstat (limited to 'include/gba')
| -rw-r--r-- | include/gba/defines.h | 2 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 16f1315d0..b68a2ad1e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -66,6 +66,4 @@ #define TOTAL_OBJ_TILE_COUNT 1024 -#define WIN_RANGE(a, b) (((a) << 8) | (b)) - #endif // GUARD_GBA_DEFINES diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index c20b69886..df79b084d 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -576,6 +576,9 @@ #define WINOUT_WINOBJ_OBJ (1 << 12) #define WINOUT_WINOBJ_CLR (1 << 13) +#define WIN_RANGE(a, b) (((a) << 8) | (b)) +#define WIN_RANGE2(a, b) ((b) | ((a) << 8)) + // BLDCNT // Bits 0-5 select layers for the 1st target #define BLDCNT_TGT1_BG0 (1 << 0) |