From 9cad5e8197c797c1aa6382c7143f48a73250d0f8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 28 Dec 2018 02:11:41 -0600 Subject: Big switch mofo --- include/gba/io_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gba/io_reg.h') diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index c20b69886..448fae06d 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -600,7 +600,7 @@ #define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA -#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) +#define BLDALPHA_BLEND(target1, target2) ((target1)) | ((target2) << 8) // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 -- cgit v1.2.3 From f30270dffe2d678b8c82bb03e23252a75dcdf61c Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 28 Dec 2018 12:56:06 -0600 Subject: Undo bad idea with BLDALPHA_BLEND macro --- include/gba/io_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gba/io_reg.h') diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 448fae06d..c20b69886 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -600,7 +600,7 @@ #define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA -#define BLDALPHA_BLEND(target1, target2) ((target1)) | ((target2) << 8) +#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 -- cgit v1.2.3 From 2fb9f490fbf961ff737c897c025ce1f5a54b2639 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 29 Dec 2018 12:46:15 -0600 Subject: Almost done with trade --- include/gba/io_reg.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/gba/io_reg.h') 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) -- cgit v1.2.3