Skip to content

Replace raw 0x10 with JOBJ_HIDDEN in HSD_JObj flag calls #2675

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 1 commit into from
Jun 13, 2026
Merged

Replace raw 0x10 with JOBJ_HIDDEN in HSD_JObj flag calls #2675

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
12 changes: 6 additions & 6 deletions src/melee/ef/eflib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,9 +1298,9 @@ void efLib_Cb_ftMr_SpecialLw(EF_Effect* effect)
fighter = GET_FIGHTER(effect->parent_gobj);

if (fighter->motion_id == 349) {
HSD_JObjClearFlagsAll(eff_child_nxt_jobj, 0x10U);
HSD_JObjClearFlagsAll(eff_child_nxt_jobj, JOBJ_HIDDEN);
} else {
HSD_JObjSetFlagsAll(eff_child_nxt_jobj, 0x10U);
HSD_JObjSetFlagsAll(eff_child_nxt_jobj, JOBJ_HIDDEN);
}
if ((fighter->cmd_vars[3] != 0U) &&
(*(s32*) &fighter->mv.co.common.x4.z != 0))
Expand Down Expand Up @@ -1328,9 +1328,9 @@ void efLib_Cb_ftLg_SpecialLw(EF_Effect* effect)
fighter = GET_FIGHTER(effect->parent_gobj);

if (fighter->motion_id == 357) {
HSD_JObjClearFlagsAll(eff_child_nxt_jobj, 0x10U);
HSD_JObjClearFlagsAll(eff_child_nxt_jobj, JOBJ_HIDDEN);
} else {
HSD_JObjSetFlagsAll(eff_child_nxt_jobj, 0x10U);
HSD_JObjSetFlagsAll(eff_child_nxt_jobj, JOBJ_HIDDEN);
}

if ((fighter->cmd_vars[3] != 0U) &&
Expand All @@ -1355,9 +1355,9 @@ void efLib_Cb_ftKp_SpecialHi(EF_Effect* effect)
jobj_1 = GET_JOBJ(effect->gobj);
jobj_2 = GET_JOBJ(effect->next->gobj);
if ((fighter = GET_FIGHTER(effect->parent_gobj))->motion_id == 359) {
HSD_JObjClearFlagsAll(jobj_2, 0x10U);
HSD_JObjClearFlagsAll(jobj_2, JOBJ_HIDDEN);
} else {
HSD_JObjSetFlagsAll(jobj_2, 0x10U);
HSD_JObjSetFlagsAll(jobj_2, JOBJ_HIDDEN);
}
if ((fighter->cmd_vars[2] & 1) && ((s32) fighter->mv.co.common.x10 != 0)) {
rotate_z = -atan2f(fighter->coll_data.floor.normal.x,
Expand Down
6 changes: 3 additions & 3 deletions src/melee/gm/gm_1832.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,9 +2216,9 @@ void fn_80188EE8(HSD_GObj* gobj)

if (gm_801A45E8(2) != 0) {
HSD_SisLib_803A6368(sub->text, 0x1E);
HSD_JObjSetFlagsAll(sub->jobjs[3], 0x10);
HSD_JObjSetFlagsAll(sub->jobjs[3], JOBJ_HIDDEN);
} else {
HSD_JObjClearFlagsAll(sub->jobjs[3], 0x10);
HSD_JObjClearFlagsAll(sub->jobjs[3], JOBJ_HIDDEN);
}

{
Expand Down Expand Up @@ -2276,7 +2276,7 @@ void fn_80188EE8(HSD_GObj* gobj)

fn_80188D3C(sub->jobjs[27]);

HSD_JObjSetFlags(sub->jobjs[25], 0x10);
HSD_JObjSetFlags(sub->jobjs[25], JOBJ_HIDDEN);

val = sub->menu_values[6];
jobj = sub->jobjs[26];
Expand Down
36 changes: 18 additions & 18 deletions src/melee/gm/gm_18A5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2974,11 +2974,11 @@ void fn_80191A54(HSD_GObj* gobj)
jobj_copy = jobj;

if (td->cur_option <= 9) {
HSD_JObjSetFlagsAll(jobj_copy, 0x10);
HSD_JObjSetFlagsAll(jobj_copy, JOBJ_HIDDEN);
return;
}

HSD_JObjClearFlagsAll(jobj_copy, 0x10);
HSD_JObjClearFlagsAll(jobj_copy, JOBJ_HIDDEN);

if (jobj == NULL) {
child = NULL;
Expand Down Expand Up @@ -3158,11 +3158,11 @@ void fn_80191FD4(HSD_GObj* gobj)
idx = fn_8018F62C(gobj);

if ((s32) tm->cur_option <= 9) {
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
return;
}

HSD_JObjClearFlagsAll(jobj, 0x10U);
HSD_JObjClearFlagsAll(jobj, JOBJ_HIDDEN);

if ((s32) idx == 0x19) {
if (jobj == NULL) {
Expand All @@ -3189,7 +3189,7 @@ void fn_80191FD4(HSD_GObj* gobj)
{
u8 chr = tm->x37[lbl_804799B8.x2 + lbl_804799B8.x3].x2;
if (lbl_803D9D20.x72[chr] != 0) {
HSD_JObjClearFlagsAll(sibling, 0x10U);
HSD_JObjClearFlagsAll(sibling, JOBJ_HIDDEN);
return;
}
if (fn_8018F3D0(fn_8018F310(fn_8018F6FC((enum CSSIconHud) chr))) ==
Expand All @@ -3198,13 +3198,13 @@ void fn_80191FD4(HSD_GObj* gobj)
fn_8019044C(sibling, 200.0f);
return;
}
HSD_JObjSetFlagsAll(sibling, 0x10U);
HSD_JObjSetFlagsAll(sibling, JOBJ_HIDDEN);
return;
}
}

if ((s32) tm->cur_option != 0xB) {
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
return;
}

Expand All @@ -3231,7 +3231,7 @@ void fn_80191FD4(HSD_GObj* gobj)
flag = 0;
}
if (flag == 0) {
HSD_JObjSetFlagsAll(child, 0x10U);
HSD_JObjSetFlagsAll(child, JOBJ_HIDDEN);
} else {
fn_8019044C(child, 0.0f);
}
Expand All @@ -3243,7 +3243,7 @@ void fn_80191FD4(HSD_GObj* gobj)
} else {
sibling = child->next;
}
HSD_JObjClearFlagsAll(sibling, 0x10U);
HSD_JObjClearFlagsAll(sibling, JOBJ_HIDDEN);

hud = fn_8018F6DC(fn_8018F3BC((s32) idx));
if (lbl_803D9D20.x72[hud] != 0) {
Expand All @@ -3261,7 +3261,7 @@ void fn_80191FD4(HSD_GObj* gobj)
fn_8019044C(sibling, 200.0f);
return;
}
HSD_JObjSetFlagsAll(sibling, 0x10U);
HSD_JObjSetFlagsAll(sibling, JOBJ_HIDDEN);
}

extern f32 lbl_804DA750; // -1.8f
Expand Down Expand Up @@ -3581,7 +3581,7 @@ void fn_80192E6C(void)
HSD_JObjSetFlagsAll((HSD_JObj*) fn_8019035C(1, lbl_804D6650->models[2], 0,
0x1A, 2, 1, fn_80192758, 0.0f)
->hsd_obj,
0x10U);
JOBJ_HIDDEN);

for (i = 0; i < 0x40; i++) {
gobj = fn_8019035C(1, lbl_804D6650->models[8], 0, 0x1A, 2, 1,
Expand All @@ -3593,7 +3593,7 @@ void fn_80192E6C(void)
gobj = fn_8019035C(1, lbl_804D6650->models[3], 0, 0x1A, 2, 1,
fn_80191E9C, 0.0f);
jobj = (HSD_JObj*) gobj->hsd_obj;
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
fn_8018FDC4(jobj, -12.300001f, 666.0f, 666.0f);
fn_8018FBD8((void*) gobj, i);
}
Expand Down Expand Up @@ -6058,21 +6058,21 @@ void fn_80197AF0(HSD_GObj* gobj)
}

if (in_range == 0) {
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
return;
}

HSD_JObjClearFlagsAll(jobj, 0x10U);
HSD_JObjClearFlagsAll(jobj, JOBJ_HIDDEN);

if (((s8) HSD_PadMasterStatus[(u8) pnum].err != 0) &&
((u8) tm->x4B8[pnum].x0 != 1))
{
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
return;
}

if ((u8) tm->x4B8[pnum].x0 == 1) {
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
}

players = tm->x30;
Expand All @@ -6090,7 +6090,7 @@ void fn_80197AF0(HSD_GObj* gobj)
if (lbl_804799D8.x44[pnum] != 6 || lbl_804799D8.x2A[pnum].state == 1 ||
lbl_804799D8.x2A[pnum].state == 2 || lbl_804799D8.x2A[pnum].state == 4)
{
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
}

counter = &lbl_804799D8.x12[pnum];
Expand Down Expand Up @@ -7817,7 +7817,7 @@ void fn_8019B458(s32* arg0)
0x1A, 3, 1, fn_80196EEC, 0.0f);

if ((s32) td2->pad_x34[0] == match) {
HSD_JObjSetFlagsAll(gobj->hsd_obj, 0x10U);
HSD_JObjSetFlagsAll(gobj->hsd_obj, JOBJ_HIDDEN);
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/melee/gm/gm_19EF.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ static void fn_8019EFC4(HSD_PadStatus* pad)
s32 i;
for (i = 10; i > 0; i--) {
if (i > lbl_80479A98.x70) {
HSD_JObjSetFlags(lbl_80479A98.x2C[i - 1], 0x10U);
HSD_JObjSetFlags(lbl_80479A98.x2C[i - 1], JOBJ_HIDDEN);
} else {
HSD_JObjClearFlags(lbl_80479A98.x2C[i - 1], 0x10U);
HSD_JObjClearFlags(lbl_80479A98.x2C[i - 1], JOBJ_HIDDEN);
}
}
}
Expand Down Expand Up @@ -327,7 +327,7 @@ static void fn_8019F810(void)
HSD_JObjReqAnimAll(lbl_804D66B0.x0, (f32) lbl_804D66B0.x4);
HSD_JObjAnimAll(lbl_804D66B0.x0);
} else {
HSD_JObjSetFlagsAll(lbl_804D66B0.x0, 0x10U);
HSD_JObjSetFlagsAll(lbl_804D66B0.x0, JOBJ_HIDDEN);
}
if (lbl_80479A98.x0 == 9) {
if ((u32) lbl_80479A98.x8 == (u32) lbl_80479A98.xC) {
Expand Down Expand Up @@ -442,9 +442,9 @@ void fn_8019F9C4(u32 arg0)
lb_80011E24(jobj, &lbl_804D66C8.x0, 0x35, -1);
lb_80011E24(jobj, &lbl_804D66C0.x0, 0x37, -1);
if ((u8) lbl_80479A98.x20 != 0) {
HSD_JObjSetFlagsAll(lbl_804D66B0.x0, 0x10);
HSD_JObjSetFlagsAll(lbl_804D66C8.x0, 0x10);
HSD_JObjSetFlagsAll(lbl_804D66C0.x0, 0x10);
HSD_JObjSetFlagsAll(lbl_804D66B0.x0, JOBJ_HIDDEN);
HSD_JObjSetFlagsAll(lbl_804D66C8.x0, JOBJ_HIDDEN);
HSD_JObjSetFlagsAll(lbl_804D66C0.x0, JOBJ_HIDDEN);
}

gobj = GObj_Create(0xE, 0xF, 0);
Expand Down Expand Up @@ -517,9 +517,9 @@ void fn_8019F9C4(u32 arg0)
HSD_JObjReqAnimAll(lbl_80479A98.x54, (f32) lbl_80479A98.x64);
for (i = 10; i > 0; i--) {
if (i > lbl_80479A98.x70) {
HSD_JObjSetFlags(lbl_80479A98.x2C[i - 1], 0x10);
HSD_JObjSetFlags(lbl_80479A98.x2C[i - 1], JOBJ_HIDDEN);
} else {
HSD_JObjClearFlags(lbl_80479A98.x2C[i - 1], 0x10);
HSD_JObjClearFlags(lbl_80479A98.x2C[i - 1], JOBJ_HIDDEN);
}
}
HSD_JObjAnimAll(jobj);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/gm/gmcamera.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ void gmCamera_801A31FC(void)
gm_8016895C(jobj_b, mdl_b, 0);
HSD_JObjReqAnimAll(jobj_b, 0.0f);
HSD_JObjAnimAll(jobj_b);
HSD_JObjSetFlagsAll(jobj_b, 0x10);
HSD_JObjSetFlagsAll(jobj_b, JOBJ_HIDDEN);
HSD_GObj_SetupProc(gobj_b, fn_801A31D8, 0);
gcus->x20 = 2;
HSD_SisLib_803A62A0(3, "SdVsCam", "SIS_VsCameraData");
Expand Down
2 changes: 1 addition & 1 deletion src/melee/gm/gmpause.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void fn_801A1134(void)
gm_8016895C(jobj, scene->models[0], 0);
HSD_JObjReqAnimAll(jobj, 1.0f);
HSD_JObjAnimAll(jobj);
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
HSD_GObj_SetupProc(gobj, fn_801A0E34, 0U);
lbl_80479B10.slot = 99;
}
40 changes: 21 additions & 19 deletions src/melee/gm/gmregclear.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2415,7 +2415,7 @@ void fn_8017FF1C(HSD_GObj* gobj)
(s32) (0.5f * (f32) (state->x110 - 0x14)) > (s32) state->x11D)
{
lb_80011E24(jobj, &sp28, state->x11D + 7, -1);
HSD_JObjClearFlagsAll(sp28, 0x10);
HSD_JObjClearFlagsAll(sp28, JOBJ_HIDDEN);
state->x11D = (u8) (state->x11D + 1);
}

Expand Down Expand Up @@ -2448,15 +2448,15 @@ void fn_8017FF1C(HSD_GObj* gobj)
}

if (state->x11E != 0) {
HSD_JObjSetFlagsAll(state->x20, 0x10);
HSD_JObjSetFlagsAll(state->x20, JOBJ_HIDDEN);
} else {
HSD_JObjClearFlagsAll(state->x20, 0x10);
HSD_JObjClearFlagsAll(state->x20, JOBJ_HIDDEN);
}

if (state->x11F != 0) {
HSD_JObjSetFlagsAll(state->x24, 0x10);
HSD_JObjSetFlagsAll(state->x24, JOBJ_HIDDEN);
} else {
HSD_JObjClearFlagsAll(state->x24, 0x10);
HSD_JObjClearFlagsAll(state->x24, JOBJ_HIDDEN);
}

if (state->x10C < 1.0f) {
Expand Down Expand Up @@ -2505,20 +2505,20 @@ s32 fn_801803FC(void* arg0)
lb_8001204C(jobj, &p->x4, lbl_803D8B88, 0xA);
}
if (state->x117 == 0) {
HSD_JObjSetFlagsAll(p->x14, 0x10U);
HSD_JObjSetFlagsAll(p->x20, 0x10U);
HSD_JObjSetFlagsAll(p->x24, 0x10U);
HSD_JObjSetFlagsAll(p->x14, JOBJ_HIDDEN);
HSD_JObjSetFlagsAll(p->x20, JOBJ_HIDDEN);
HSD_JObjSetFlagsAll(p->x24, JOBJ_HIDDEN);
}
if (p->x11A != 0) {
for (i = 0; i < 0xA; i++) {
lb_80011E24(jobj, &sp10, i + 7, -1);
HSD_JObjSetFlagsAll(sp10, 0x10U);
HSD_JObjSetFlagsAll(sp10, JOBJ_HIDDEN);
}
HSD_JObjSetFlagsAll(p->x10, 0x10U);
HSD_JObjSetFlagsAll(p->x10, JOBJ_HIDDEN);
} else {
HSD_JObjSetFlagsAll(p->x1C, 0x10U);
HSD_JObjSetFlagsAll(p->x1C, JOBJ_HIDDEN);
if (p->x118 != 0) {
HSD_JObjSetFlagsAll(p->x18, 0x10U);
HSD_JObjSetFlagsAll(p->x18, JOBJ_HIDDEN);
}
}
temp = p->x4;
Expand Down Expand Up @@ -2740,7 +2740,7 @@ void fn_80180C14(HSD_GObj* gobj)
HSD_JObj* jobj = gobj->hsd_obj;

if ((lbl_80472E48.x0 & 3) != 0) {
HSD_JObjClearFlagsAll(jobj, 0x10);
HSD_JObjClearFlagsAll(jobj, JOBJ_HIDDEN);
HSD_JObjAnimAll(jobj);
}
}
Expand Down Expand Up @@ -2815,7 +2815,7 @@ void fn_80180C60(HSD_GObj* gobj)
if (!(((u8) lbl_80472E48.x0 >> 2) & 3)) {
HSD_JObjReqAnimAll(jobj, 0.0f);
} else if (lbl_80472E48.x0 & 3) {
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);
} else if (dist > lbl_80472E48.x14[gm_80164024((u8) lbl_80472E48.unk_4)]) {
if (lbl_804D65D4 == 0) {
lbAudioAx_800237A8(0x9C40, 0x7F, 0x40);
Expand All @@ -2825,7 +2825,8 @@ void fn_80180C60(HSD_GObj* gobj)
lbl_804D65D4 = 1;
}
HSD_JObjClearFlagsAll(
HSD_JObjGetNext(HSD_JObjGetChild(HSD_JObjGetChild(jobj))), 0x10U);
HSD_JObjGetNext(HSD_JObjGetChild(HSD_JObjGetChild(jobj))),
JOBJ_HIDDEN);
}

if (lbLang_IsSavedLanguageUS() != 0) {
Expand Down Expand Up @@ -2988,7 +2989,7 @@ void fn_80181708(void)
gm_8016895C(jobj, *lbl_804D65CC, 0);
HSD_JObjReqAnimAll(jobj, 0.0f);
HSD_JObjAnimAll(jobj);
HSD_JObjSetFlagsAll(jobj, 0x10U);
HSD_JObjSetFlagsAll(jobj, JOBJ_HIDDEN);

gobj = (new_var = GObj_Create(0xEU, 0xFU, 0U));
jobj = HSD_JObjLoadJoint((*lbl_804D65D0)->joint);
Expand All @@ -2998,13 +2999,14 @@ void fn_80181708(void)
gm_8016895C(jobj, *lbl_804D65D0, 0);
HSD_JObjReqAnimAll(jobj, 10.0f);
HSD_JObjAnimAll(jobj);
HSD_JObjClearFlagsAll(jobj, 0x10U);
HSD_JObjClearFlagsAll(jobj, JOBJ_HIDDEN);

HSD_JObjSetFlagsAll(
HSD_JObjGetNext(HSD_JObjGetChild(HSD_JObjGetChild(jobj))), 0x10U);
HSD_JObjGetNext(HSD_JObjGetChild(HSD_JObjGetChild(jobj))),
JOBJ_HIDDEN);
HSD_JObjClearFlagsAll(HSD_JObjGetNext(HSD_JObjGetNext(
HSD_JObjGetChild(HSD_JObjGetChild(jobj)))),
0x10U);
JOBJ_HIDDEN);

gm_80168F88();
}
Expand Down
Loading
Loading