Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lighting' into lighting-expanded-id

Browse Source
This commit is contained in:
Ariel A 2025-01-29 23:07:02 -05:00
commit f993c904e8
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/palette.c
View File

@ -2,8 +2,10 @@
#include "palette.h" #include "palette.h"
#include "util.h" #include "util.h"
#include "decompress.h" #include "decompress.h"
#include "field_weather.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "task.h" #include "task.h"
#include "constants/field_weather.h"
#include "constants/rgb.h" #include "constants/rgb.h"
enum enum
@ -967,25 +969,41 @@ static void UpdateBlendRegisters(void)
{ {
SetGpuReg(REG_OFFSET_BLDCNT, (u16)gPaletteFade_blendCnt); SetGpuReg(REG_OFFSET_BLDCNT, (u16)gPaletteFade_blendCnt);
SetGpuReg(REG_OFFSET_BLDY, gPaletteFade.y); SetGpuReg(REG_OFFSET_BLDY, gPaletteFade.y);
// If fade-out, also adjust BLDALPHA and DISPCNT // if TGT2 enabled, also adjust BLDALPHA and DISPCNT
if (!gPaletteFade.yDec /*&& gPaletteFade.mode == HARDWARE_FADE*/) { if (((u16)gPaletteFade_blendCnt) & BLDCNT_TGT2_ALL) {
u16 bldAlpha = GetGpuReg(REG_OFFSET_BLDALPHA); u16 bldAlpha = GetGpuReg(REG_OFFSET_BLDALPHA);
u8 tgt1 = BLDALPHA_TGT1(bldAlpha); u8 tgt1 = BLDALPHA_TGT1(bldAlpha);
u8 tgt2 = BLDALPHA_TGT2(bldAlpha); u8 tgt2 = BLDALPHA_TGT2(bldAlpha);
u8 bldFade; u8 mode = (gPaletteFade_blendCnt & BLDCNT_EFFECT_EFF_MASK) == BLDCNT_EFFECT_LIGHTEN ? FADE_FROM_WHITE : FADE_FROM_BLACK;
if (!gPaletteFade.yDec)
mode++;
switch (gPaletteFade_blendCnt & BLDCNT_EFFECT_EFF_MASK) ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
switch (mode)
{ {
// FADE_TO_BLACK case FADE_FROM_BLACK:
case BLDCNT_EFFECT_DARKEN: // increment each target until reaching weather's values
bldFade = BLDALPHA_TGT1(max(0, 16 - gPaletteFade.y));
SetGpuReg( SetGpuReg(
REG_OFFSET_BLDALPHA, REG_OFFSET_BLDALPHA,
BLDALPHA_BLEND(min(tgt1, bldFade), min(tgt2, bldFade)) BLDALPHA_BLEND(
min(++tgt1, gWeatherPtr->currBlendEVA),
min(++tgt2, gWeatherPtr->currBlendEVB)
)
); );
break; break;
// FADE_TO_WHITE case FADE_TO_BLACK:
case BLDCNT_EFFECT_LIGHTEN: bldAlpha = BLDALPHA_TGT1(max(0, 16 - gPaletteFade.y));
SetGpuReg(
REG_OFFSET_BLDALPHA,
BLDALPHA_BLEND(min(tgt1, bldAlpha), min(tgt2, bldAlpha))
);
break;
// Not handled; blend sprites will pop in,
// but the effect coming from white looks okay
// case FADE_FROM_WHITE:
// break;
case FADE_TO_WHITE:
SetGpuReg( SetGpuReg(
REG_OFFSET_BLDALPHA, REG_OFFSET_BLDALPHA,
BLDALPHA_BLEND(min(++tgt1, 31), min(++tgt2, 31)) BLDALPHA_BLEND(min(++tgt1, 31), min(++tgt2, 31))
@ -996,8 +1014,7 @@ static void UpdateBlendRegisters(void)
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
break; break;
} }
} else }
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
if (gPaletteFade.hardwareFadeFinishing) if (gPaletteFade.hardwareFadeFinishing)
{ {

2
src/scrcmd.c
View File

@ -663,6 +663,8 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
switch (mode) switch (mode)
{ {
case FADE_FROM_BLACK: case FADE_FROM_BLACK:
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
break;
case FADE_FROM_WHITE: case FADE_FROM_WHITE:
// Restore last weather blend before fading in, // Restore last weather blend before fading in,
// since BLDALPHA was modified by fade-out // since BLDALPHA was modified by fade-out