Skip to content

set_alpha_blend 100%, abandon_slugs 100%, choose_hand 100%, NewTime 37% #599

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
JoshSanch merged 2 commits into from
Sep 27, 2025
Merged

set_alpha_blend 100%, abandon_slugs 100%, choose_hand 100%, NewTime 37% #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28f0fe
set_alpha_blend, abandon_slugs, choose_hand
LSLees Sep 26, 2025
a6ef80e
rm wip newtime
LSLees Sep 26, 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
25 changes: 16 additions & 9 deletions src/SB/Game/zNPCTypeBossSB2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,10 @@ namespace
{ 7, "RSB_armhit2", 0, 0 }, { 8, "RSB_armsmash", 0, 0 }, { 9, "RSB_foor_impact", 0, 0 },
};

S32 set_alpha_blend(xModelInstance*)
void set_alpha_blend(xModelInstance* model)
{
return 0; // to-do
model->PipeFlags &= ~0xFF0C;
model->PipeFlags |= 0x6508;
}

F32 max(float maxFloat1, float maxFloat2) //Temp names till file is further
Expand Down Expand Up @@ -1129,6 +1130,9 @@ void zNPCB_SB2::Destroy()
zNPCCommon::Destroy();
}

void zNPCB_SB2::NewTime(xScene* x, float y)
{
}

void zNPCB_SB2::render_debug()
{
Expand Down Expand Up @@ -1223,7 +1227,12 @@ S32 zNPCB_SB2::player_on_ground() const

void zNPCB_SB2::abandon_slugs()
{

slug_data* pCurSlug = &slugs[0];
slug_data* pLastSlug = &pCurSlug[3];
for (; pCurSlug != pLastSlug; pCurSlug++)
{
pCurSlug->abandoned = 1;
}
}

void zNPCB_SB2::reset_stage()
Expand Down Expand Up @@ -1394,11 +1403,9 @@ S32 zNPCGoalBossSB2Death::Process(en_trantype*, F32, void*, xScene*)
return 0;
}

// WEAK

void zNPCB_SB2::choose_hand() //53%
void zNPCB_SB2::choose_hand()
{
S32 rand;
rand = xrand() >> 0xd & 1;

S32 r = xrand();
S32 b = (r >> 13) & 1;
this->active_hand = (b == 0 ? LEFT_HAND : RIGHT_HAND);
}
8 changes: 6 additions & 2 deletions src/SB/Game/zNPCTypeBossSB2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ struct zNPCB_SB2 : zNPCBoss
zNPCB_SB2(S32 myType);
void SelfSetup();
void Destroy();
void NewTime(xScene*, float);
void move_nodes();
void move_hand(zNPCB_SB2::hand_data&, float);
void update_bounds();
void update_platforms(float);
void update_slugs(float);
void render_debug();
void decompose();
void show_nodes();
Expand All @@ -235,8 +241,6 @@ struct zNPCB_SB2 : zNPCBoss
void abandon_slugs();
void set_vulnerable(bool);
void say(int);

// WEAK
void choose_hand();
};

Expand Down