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/unk_transition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/unk_transition.c') diff --git a/src/unk_transition.c b/src/unk_transition.c index 7346e06ab..0faf45402 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -337,7 +337,7 @@ static bool8 sub_81DAACC(struct Task *task) else { sub_81DA700(); - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F41); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); -- 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/unk_transition.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/unk_transition.c') diff --git a/src/unk_transition.c b/src/unk_transition.c index 0faf45402..d56998b5b 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -338,7 +338,7 @@ static bool8 sub_81DAACC(struct Task *task) { sub_81DA700(); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgY(0, 0x500, 2); @@ -368,11 +368,11 @@ static bool8 sub_81DAB4C(struct Task *task) } else { - u16 var; + u16 blnd; task->data[2]++; - var = task->data[2]; - SetGpuReg(REG_OFFSET_BLDALPHA, (var) | ((16 - var) << 8)); + blnd = task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(blnd, 16 - blnd)); } return FALSE; -- cgit v1.2.3