Merge pull request #2007 from cawtds/ub-fix-battle-transition
UB fix in battle_transition.c
This commit is contained in:
commit
ac28fc52e5
1 changed files with 4 additions and 0 deletions
|
@ -1907,7 +1907,11 @@ static bool8 ClockwiseWipe_TopRight(struct Task *task)
|
||||||
{
|
{
|
||||||
sTransitionData->VBlank_DMA = FALSE;
|
sTransitionData->VBlank_DMA = FALSE;
|
||||||
|
|
||||||
|
#ifdef UBFIX
|
||||||
|
InitBlackWipe(sTransitionData->data, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sTransitionData->tWipeEndX, 0, 1, 1);
|
||||||
|
#else
|
||||||
InitBlackWipe(sTransitionData->data, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sTransitionData->tWipeEndX, -1, 1, 1);
|
InitBlackWipe(sTransitionData->data, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sTransitionData->tWipeEndX, -1, 1, 1);
|
||||||
|
#endif
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
gScanlineEffectRegBuffers[0][sTransitionData->tWipeCurrY] = (sTransitionData->tWipeCurrX + 1) | ((DISPLAY_WIDTH / 2) << 8);
|
gScanlineEffectRegBuffers[0][sTransitionData->tWipeCurrY] = (sTransitionData->tWipeCurrX + 1) | ((DISPLAY_WIDTH / 2) << 8);
|
||||||
|
|
Loading…
Reference in a new issue