Skip to content

itFoxBlaster: store shot effects as typed pointers #3673

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
itsgrimetime merged 2 commits into from
Oct 13, 2026
Merged

itFoxBlaster: store shot effects as typed pointers #3673

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
79a0386
Store blaster shot effects as typed pointers
itsgrimetime Oct 13, 2026
7fd67eb
Merge branch 'master' into codex/blaster-effect-pointers
itsgrimetime Oct 13, 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
15 changes: 7 additions & 8 deletions src/melee/it/itCharItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <Runtime/platform.h>

#include <melee/ef/forward.h>
#include <melee/it/forward.h>
#include <melee/lb/forward.h>
#include <sysdolphin/baselib/forward.h>
Expand Down Expand Up @@ -146,14 +147,12 @@ typedef struct {
// ____but not yet invisible)
// 0: when xDD8 <= 0 or xDD8 >= 5
// 1: when cmd_var3 = 1 (when gun shooting sfx starts)
/* xC */ bool xDE0; // false when not shot yet; true after shot (in this
// spawn instance of the blaster - not put away)
/* x10 */ s32 xDE4[6]; // group 1; gets set to 0 in func (it_802ADF10)
// that sets item joint locations from
// corresponding fighter joint locations
/* x28 */ s32 xDFC[6]; // group 2; gets set to 0 in func (it_802ADF10)
// that sets item joint locations from
// corresponding fighter joint locations
/* xC */ bool xDE0; // false when not shot yet; true after shot (in this
// spawn instance of the blaster - not put away)
/* x10 */ EF_Effect* xDE4[6]; // group 1; shot effect history
/* x28 */ s32 xDFC[6]; // group 2; gets set to 0 in func (it_802ADF10)
// that sets item joint locations from
// corresponding fighter joint locations
/* x40 */ Vec3 xE14[6]; // group 3; gets set as the vector from fighter's
// current position to the joint holding the
// blaster on the frame blaster its shot
Expand Down
12 changes: 6 additions & 6 deletions src/melee/it/kinds/itfoxblaster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ void it_802ADF10(HSD_GObj* item_gobj)
itFoxBlaster_SetShotAngle(item, &ft_hold_joint_pos,
&it_hold_joint_pos);
item->xDD4_itemVar.foxblaster.xDE4[0] =
(s32) efSync_Spawn(1166, item_gobj, &ft_hold_joint_pos,
&item->xDD4_itemVar.foxblaster.angle[0]);
efSync_Spawn(1166, item_gobj, &ft_hold_joint_pos,
&item->xDD4_itemVar.foxblaster.angle[0]);
break;
case It_Kind_Kirby_FoxBlaster:
case It_Kind_Kirby_FalcoBlaster:
Expand All @@ -193,8 +193,8 @@ void it_802ADF10(HSD_GObj* item_gobj)
itFoxBlaster_SetShotAngle(item, &ft_hold_joint_pos,
&it_hold_joint_pos);
item->xDD4_itemVar.foxblaster.xDE4[0] =
(s32) efSync_Spawn(1196, item_gobj, &ft_hold_joint_pos,
&item->xDD4_itemVar.foxblaster.angle[0]);
efSync_Spawn(1196, item_gobj, &ft_hold_joint_pos,
&item->xDD4_itemVar.foxblaster.angle[0]);
break;
default:
break;
Expand All @@ -215,7 +215,7 @@ void it_802ADF10(HSD_GObj* item_gobj)
}

item = GET_ITEM(item_gobj);
item->xDD4_itemVar.foxblaster.xDE4[0] = 0;
item->xDD4_itemVar.foxblaster.xDE4[0] = NULL;
item->xDD4_itemVar.foxblaster.xDFC[0] = 0;
item->xDD4_itemVar.foxblaster.angle[0] =
item->xDD4_itemVar.foxblaster.xE14[0].x =
Expand Down Expand Up @@ -434,7 +434,7 @@ static inline void itFoxBlaster_ClearShot(Item_GObj* item_gobj, int index)
{
Item* item = GET_ITEM(item_gobj);

item->xDD4_itemVar.foxblaster.xDE4[index] = 0;
item->xDD4_itemVar.foxblaster.xDE4[index] = NULL;
item->xDD4_itemVar.foxblaster.xDFC[index] = 0;
item->xDD4_itemVar.foxblaster.xE14[index].z = 0.0F;
item->xDD4_itemVar.foxblaster.xE14[index].y = 0.0F;
Expand Down
Loading