Skip to content

Flash now fully illuminates caves like in Fire Red. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamsilva wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Flash now fully illuminates caves like in Fire Red. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/scripts/flash.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EventScript_UseFlash:: @ 82926F8
animateflash 1
setflashradius 1
animateflash 0
setflashradius 0
end
4 changes: 2 additions & 2 deletions src/field_screen_effect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions src/overworld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down