Skip to content

Fix Item_8026AD20 argument #3089

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

Draft
g-guthrie wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix Item_8026AD20 argument #3089

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
39f7a6f
Fix Item_8026AD20 argument
Aug 14, 2026
0c8bc7a
Improve ftCo_80095EFC register allocation
Aug 14, 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
13 changes: 8 additions & 5 deletions src/melee/ft/chara/ftCommon/ftCo_ItemThrow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,24 +554,27 @@ void ftCo_80095EFC(Fighter_GObj* gobj)
ftCo_MS_LightThrowF]
.x8;
float throw_speed = throw_scale * base_throw_speed;
// Needed for matching register allocation.
float item_throw_speed = throw_speed;
{
vec2.x = fsm * (fp->mv.co.itemthrow4.x8.x - vec0.x) +
vec0.x;
{
vec2.y =
float vec1_y =
fsm * (fp->mv.co.itemthrow4.x8.y - vec0.y) +
vec0.y;
vec2.y = vec1_y;
vec2.z = 0;
pl_8003E978(fp->player_id, fp->x221F_b4,
fp->item_gobj, vec2.y,
fp->item_gobj, vec1_y,
base_throw_speed, cd_xB4, throw_speed,
vec0.x, vec0.y, fsm);
}
{
FtMoveId msid = fp->motion_id;
if (msid == (FtMoveId) ftCo_MS_LightThrowDrop) {
Item_8026AC74(fp->item_gobj, &vec2, &vec1,
throw_speed);
item_throw_speed);
} else if (msid >= (FtMoveId) ftCo_MS_LightThrowF4)
{
if (itIsHeavy(fp->item_gobj) == 1) {
Expand All @@ -580,15 +583,15 @@ void ftCo_80095EFC(Fighter_GObj* gobj)
ftCommon_8007EBAC(fp, 27, 0);
}
Item_8026AD20(fp->item_gobj, &vec2, &vec1,
throw_speed);
item_throw_speed, 1);
} else {
if (itIsHeavy(fp->item_gobj) == 1) {
ftCommon_8007EBAC(fp, 28, 0);
} else {
ftCommon_8007EBAC(fp, 26, 0);
}
Item_8026AD20(fp->item_gobj, &vec2, &vec1,
throw_speed);
item_throw_speed, 0);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/item.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@ void Item_8026AC74(HSD_GObj* gobj, Vec3* arg1, Vec3* arg2, f32 arg3)
}
}

void Item_8026AD20(HSD_GObj* gobj, Vec3* arg1, Vec3* arg2, f32 arg3)
void Item_8026AD20(HSD_GObj* gobj, Vec3* arg1, Vec3* arg2, f32 arg3, int arg4)
{
Item* item_data = GetItemData(gobj);
it_802731E0(gobj);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct ItemStateDesc;
Fighter_Part part);
/* 26ABD8 */ void Item_8026ABD8(Item_GObj* gobj, Vec3* pos, float);
/* 26AC74 */ void Item_8026AC74(HSD_GObj* gobj, Vec3*, Vec3*, float);
/* 26AD20 */ void Item_8026AD20(HSD_GObj* gobj, Vec3*, Vec3*, float);
/* 26AD20 */ void Item_8026AD20(HSD_GObj* gobj, Vec3*, Vec3*, float, int);
/* 26ADC0 */ void Item_8026ADC0(HSD_GObj* gobj);
/* 26AE10 */ void Item_OnUserDataRemove(void* user_data);
/* 26AE10 */ void lbl_8026AE10(void* user_data);
Expand Down
Loading