Skip to content

Possible solution for missing light fixtures #667

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
joshuarwood wants to merge 2 commits into
base: port
Choose a base branch
from
Open

Possible solution for missing light fixtures #667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
759a436
adjust light positions when loading bg data at level start
joshuarwood Nov 4, 2025
5dd8cce
only shift room 80, light 3 in x-axis since it's visible from the z d…
joshuarwood Nov 5, 2025
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
41 changes: 41 additions & 0 deletions src/game/bg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,25 @@ s32 g_BgNumRoomLoadCandidates = 0;
u16 g_BgFrameCount = 0xfffe;
s32 g_BgNumPortalCameraCacheItems = 0;

#ifndef PLATFORM_N64

void bgAdjustLightPosition(s32 roomnum, s32 lightnum, s16 dx, s16 dy, s16 dz)
{
s32 i;
struct light *roomlights;

bgLoadRoom(roomnum);
roomlights = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].gfxdata->lightsindex * 0x22];

for (i = 0; i < 4; i++) {
roomlights[lightnum].bbox[i].x += dx;
roomlights[lightnum].bbox[i].y += dy;
roomlights[lightnum].bbox[i].z += dz;
}
}

#endif

void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly)
{
struct prop *prop;
Expand Down Expand Up @@ -2059,6 +2078,28 @@ void bgBuildTables(s32 stagenum)
#if VERSION < VERSION_NTSC_1_0
bgBuildReferenceLightSums();
#endif

#ifndef PLATFORM_N64
switch (stagenum) {
case STAGE_INVESTIGATION:
bgAdjustLightPosition(21, 0, 0, -1, 0);
bgAdjustLightPosition(46, 0, 0, -1, 0);
bgAdjustLightPosition(47, 0, 0, -1, 0);
bgAdjustLightPosition(52, 0, 0, -1, 0);
bgAdjustLightPosition(53, 0, 0, -1, 0);
bgAdjustLightPosition(62, 0, 0, -1, 0);
bgAdjustLightPosition(71, 0, 0, -1, 0);
bgAdjustLightPosition(73, 0, 0, -1, 0);
bgAdjustLightPosition(74, 0, 0, -1, 0);
bgAdjustLightPosition(75, 0, 0, -1, 0);
bgAdjustLightPosition(76, 0, 0, -1, 0);
bgAdjustLightPosition(77, 0, 0, -1, 0);
bgAdjustLightPosition(98, 0, 0, -1, 0);
bgAdjustLightPosition(80, 3, -1, 0, 0);
default:
break;
}
#endif
}

void bgStop(void)
Expand Down