From 7f6f6c33ab9a9a5ab97aff8976ea2cb153106624 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 26 Dec 2018 13:05:02 +0100 Subject: Fix BgAttributes --- src/evolution_scene.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/evolution_scene.c') diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 1070c69e9..ea2302130 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1483,8 +1483,8 @@ static void InitMovingBackgroundTask(bool8 isLink) SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); - SetBgAttribute(innerBgId, BG_CTRL_ATTR_MOSAIC, 2); - SetBgAttribute(outerBgId, BG_CTRL_ATTR_MOSAIC, 2); + SetBgAttribute(innerBgId, BG_ATTR_PRIORITY, 2); + SetBgAttribute(outerBgId, BG_ATTR_PRIORITY, 2); ShowBg(1); ShowBg(2); @@ -1529,8 +1529,8 @@ static void sub_8140174(void) gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; - SetBgAttribute(1, BG_CTRL_ATTR_MOSAIC, sub_80391E0(1, 5)); - SetBgAttribute(2, BG_CTRL_ATTR_MOSAIC, sub_80391E0(2, 5)); + SetBgAttribute(1, BG_ATTR_PRIORITY, sub_80391E0(1, 5)); + SetBgAttribute(2, BG_ATTR_PRIORITY, sub_80391E0(2, 5)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); Free(sEvoMovingBgPtr); } -- cgit v1.2.3 From 7e4db39da531320f0f2ff180ddbd2f2c21f84fce Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 26 Dec 2018 13:43:07 +0100 Subject: Fix bldcnt gpu reg args --- src/evolution_scene.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/evolution_scene.c') diff --git a/src/evolution_scene.c b/src/evolution_scene.c index ea2302130..1b3133e9e 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1479,7 +1479,7 @@ static void InitMovingBackgroundTask(bool8 isLink) if (!isLink) { - SetGpuReg(REG_OFFSET_BLDCNT, 0x442); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG2); SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); @@ -1491,7 +1491,7 @@ static void InitMovingBackgroundTask(bool8 isLink) } else { - SetGpuReg(REG_OFFSET_BLDCNT, 0x842); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3); SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); } -- cgit v1.2.3 From 6761a049daa44bce169638356dd1760c55e786c5 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 26 Dec 2018 14:03:48 +0100 Subject: Fix Bldalpha args --- src/evolution_scene.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/evolution_scene.c') diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 1b3133e9e..2c1df814b 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1480,7 +1480,7 @@ static void InitMovingBackgroundTask(bool8 isLink) if (!isLink) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG2); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); SetBgAttribute(innerBgId, BG_ATTR_PRIORITY, 2); @@ -1492,7 +1492,7 @@ static void InitMovingBackgroundTask(bool8 isLink) else { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); } -- cgit v1.2.3