diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index bb4ae84eb5..b7e9e456b4 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ EventScript_UseFlash:: @ 82926F8 - animateflash 1 - setflashradius 1 + animateflash 0 + setflashradius 0 end diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 2daaa40cee..96ddedc3fc 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -60,7 +60,7 @@ static void Task_BarnDoorWipeChild(u8 taskId); static void StartWarpFadeIn(bool8 a0); // const -static const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; +static const u16 sFlashLevelPixelRadii[] = { 200, 72, 56, 40, 24 }; const s32 gMaxFlashLevel = ARRAY_COUNT(sFlashLevelPixelRadii) - 1; const struct ScanlineEffectParams sFlashEffectParams = @@ -1040,7 +1040,7 @@ void AnimateFlash(u8 flashLevel) u8 value = 0; if (!flashLevel) value = 1; - sub_80AFFDC(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); + sub_80AFFDC(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 2); sub_80AFFB8(); ScriptContext2_Enable(); } diff --git a/src/overworld.c b/src/overworld.c index f67631c938..be2e30a631 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1064,9 +1064,9 @@ void SetDefaultFlashLevel(void) if (!gMapHeader.cave) gSaveBlock1Ptr->flashLevel = 0; else if (FlagGet(FLAG_SYS_USE_FLASH)) - gSaveBlock1Ptr->flashLevel = 1; + gSaveBlock1Ptr->flashLevel = 0; else - gSaveBlock1Ptr->flashLevel = gMaxFlashLevel - 1; + gSaveBlock1Ptr->flashLevel = gMaxFlashLevel; } void Overworld_SetFlashLevel(s32 flashLevel)