Skip to content

lb: implement lb_80019628; improve four lbbgflash functions #2508

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

Merged
ribbanya merged 4 commits into from
May 16, 2026
Merged

lb: implement lb_80019628; improve four lbbgflash functions #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a735a1c
lb: first-pass implementation of lb_80019628 in lb_0192
itsgrimetime May 16, 2026
e480de2
lb: improve fn_8001FC08 matching in lbbgflash
itsgrimetime May 16, 2026
04f0d39
lb: improve lbBgFlash_80020E38 magnitude calc in lbbgflash
itsgrimetime May 16, 2026
321cbf9
lb: improve fn_8002113C assert visibility in lbbgflash
itsgrimetime May 16, 2026
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
60 changes: 60 additions & 0 deletions src/melee/lb/lb_0192.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,66 @@ void fn_800195FC(void)
lbSnap_8001D2BC();
}

void lb_80019628(void)
{
OSAlarm* alarm = &lb_804329F0.alarm;
OSTime period;
u64 new_val = lb_804329F0.x38;

if ((s64) new_val == lb_804329F0.x0[0].x0) {
return;
}

lb_804329F0.x0[0].x0 = (s64) new_val;

if (lb_804329F0.x0[0].x8 >= lb_804329F0.x0[0].x0) {
lb_804329F0.x0[0].x8 = 0;
}

period = (OSTime) (f64) (u32) OS_TIMER_CLOCK;

if (lb_804329F0.x0[0].x0 < period) {
period = lb_804329F0.x0[0].x0;
}

if (lb_804329F0.x0[1].x0 < period) {
period = lb_804329F0.x0[1].x0;
}

{
OSTime fps_period =
(OSTime) (f64) (0.016666668f * (f32) (u32) OS_TIMER_CLOCK);
if (period >= fps_period) {
period = fps_period;
}
}

if ((s64) lb_804329F0.x40 == period) {
return;
}

lb_804329F0.x40 = (u64) period;

{
u32 rate = (u32) ((u64) period / (OS_TIMER_CLOCK / 1000));
if (rate > 11) {
rate = 11;
}
if (lb_804329F0.x4 != rate) {
PADSetSamplingRate(rate);
lb_804329F0.x4 = rate;
}
}

if (lb_804329F0.x48 != 0) {
OSCancelAlarm(alarm);
}
OSCreateAlarm(alarm);
OSSetPeriodicAlarm(alarm, lb_804329F0.x40, lb_804329F0.x40,
(OSAlarmHandler) fn_800195FC);
lb_804329F0.x48 = 1;
}

void lb_80019880(u64 arg0)
{
lb_804329F0.x38 = arg0;
Expand Down
93 changes: 55 additions & 38 deletions src/melee/lb/lbbgflash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,66 +80,82 @@ void fn_8001FC08(void)
f32 val;

if (data->x20[0] > 0.0f) {
val = data->x10[0] + data->x20[0];
if (val < (f32) data->x8.r) {
data->x10[0] = val;
u8 target = data->x8.r;
f32* cur = &data->x10[0];
val = *cur + data->x20[0];
if (val < (f32) target) {
*cur = val;
} else {
data->x10[0] = (f32) data->x8.r;
*cur = (f32) target;
}
} else {
val = data->x10[0] + data->x20[0];
if (val > (f32) data->x8.r) {
data->x10[0] = val;
u8 target = data->x8.r;
f32* cur = &data->x10[0];
val = *cur + data->x20[0];
if (val > (f32) target) {
*cur = val;
} else {
data->x10[0] = (f32) data->x8.r;
*cur = (f32) target;
}
}

if (data->x20[1] > 0.0f) {
val = data->x10[1] + data->x20[1];
if (val < (f32) data->x8.g) {
data->x10[1] = val;
u8 target = data->x8.g;
f32* cur = &data->x10[1];
val = *cur + data->x20[1];
if (val < (f32) target) {
*cur = val;
} else {
data->x10[1] = (f32) data->x8.g;
*cur = (f32) target;
}
} else {
val = data->x10[1] + data->x20[1];
if (val > (f32) data->x8.g) {
data->x10[1] = val;
u8 target = data->x8.g;
f32* cur = &data->x10[1];
val = *cur + data->x20[1];
if (val > (f32) target) {
*cur = val;
} else {
data->x10[1] = (f32) data->x8.g;
*cur = (f32) target;
}
}

if (data->x20[2] > 0.0f) {
val = data->x10[2] + data->x20[2];
if (val < (f32) data->x8.b) {
data->x10[2] = val;
u8 target = data->x8.b;
f32* cur = &data->x10[2];
val = *cur + data->x20[2];
if (val < (f32) target) {
*cur = val;
} else {
data->x10[2] = (f32) data->x8.b;
*cur = (f32) target;
}
} else {
val = data->x10[2] + data->x20[2];
if (val > (f32) data->x8.b) {
data->x10[2] = val;
u8 target = data->x8.b;
f32* cur = &data->x10[2];
val = *cur + data->x20[2];
if (val > (f32) target) {
*cur = val;
} else {
data->x10[2] = (f32) data->x8.b;
*cur = (f32) target;
}
}

if (data->x20[3] > 0.0f) {
val = data->x10[3] + data->x20[3];
if (val < (f32) data->x8.a) {
data->x10[3] = val;
u8 target = data->x8.a;
f32* cur = &data->x10[3];
val = *cur + data->x20[3];
if (val < (f32) target) {
*cur = val;
} else {
data->x10[3] = (f32) data->x8.a;
*cur = (f32) target;
}
} else {
val = data->x10[3] + data->x20[3];
if (val > (f32) data->x8.a) {
data->x10[3] = val;
u8 target = data->x8.a;
f32* cur = &data->x10[3];
val = *cur + data->x20[3];
if (val > (f32) target) {
*cur = val;
} else {
data->x10[3] = (f32) data->x8.a;
*cur = (f32) target;
}
}
}
Expand Down Expand Up @@ -579,11 +595,11 @@ void lbBgFlash_80020E38(HSD_JObj* jobj, Vec3* dir, f32 max_angle,
f32 z_col_z;
f32 z_col_y;
f32 z_col_x;
f32 dz2 = dz * dz;
f32 dx2 = dx * dx;
f32 dy2 = dy * dy;
f32 dz2 = dz * dz;
volatile f32 tmp;
if (dz2 + dy2 + dx2 == 0.0f) {
if (dx2 + dy2 + dz2 == 0.0f) {
return;
}

Expand Down Expand Up @@ -672,11 +688,12 @@ void fn_8002113C(HSD_JObj* jobj, Vec3* axis, f32 angle)
PSMTXRotAxisRad(rotMtx, (Vec*) &localAxis, -angle);

if (!(jobj->flags & JOBJ_USE_QUATERNION)) {
Fake_HSD_JObjGetRotation(jobj, &rot);
HSD_MkRotationMtx(tmpMtx, (Vec3*) &rot);
Quaternion* volatile rot_ptr = &rot;
Fake_HSD_JObjGetRotation(jobj, rot_ptr);
HSD_MkRotationMtx(tmpMtx, (Vec3*) rot_ptr);
PSMTXConcat(tmpMtx, rotMtx, result);
HSD_QuatLib_8037EB28(result, (Vec3*) &rot);
FakeHSD_JObjSetRotation(jobj, &rot);
HSD_QuatLib_8037EB28(result, (Vec3*) rot_ptr);
FakeHSD_JObjSetRotation(jobj, rot_ptr);
} else {
HSD_JObjGetRotation(jobj, &rot2);
HSD_MtxQuat(tmpMtx, &rot2);
Expand Down
Loading