Skip to content
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

Partially match lgunbeam #1456

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Partially match lgunbeam #1456

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
4 changes: 2 additions & 2 deletions src/melee/it/itCommonItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ typedef struct ItLGunBeamAttr {
typedef struct ItLGunBeamVars {
/* +0 ip+DD4 */ Vec3 position0;
/* +C ip+DE0 */ Vec3 position1;
/* +18 ip+DEC */ Vec3 position2;
/* +18 ip+DEC */ Vec3 velocity;
/* +24 ip+DF8 */ f32 angle0;
/* +28 ip+DFC */ f32 angle1;
/* +2C ip+E00 */ f32 lifetime;
/* +30 ip+E04 */ f32 xE04;
/* +30 ip+E04 */ int xE04;
} ItLGunBeamVars;

typedef struct ItLGunRayAttr {
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/it_266F.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ typedef void (*ItCallback)(HSD_GObj*);
/* 272F7C */ void it_80272F7C(HSD_JObj*, f32);
/* 273030 */ bool it_80273030(Item_GObj*);
/* 273078 */ bool itColl_BounceOffShield(Item_GObj*);
/* 273130 */ bool it_80273130(Item_GObj*);
/* 273130 */ enum_t it_80273130(Item_GObj*);
/* 273168 */ void it_80273168(HSD_GObj* gobj);
/* 2731A4 */ void it_802731A4(HSD_GObj*);
/* 2731E0 */ void it_802731E0(HSD_GObj*);
Expand Down
4 changes: 2 additions & 2 deletions src/melee/it/it_2725.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <placeholder.h>

/* 272828 */ s32 it_80272828(s32);
/* 272940 */ void it_80272940(Item_GObj* gobj);
/* 272980 */ void it_80272980(Item_GObj*, f32);
/* 272A60 */ void it_80272A60(Item_GObj*);
/* 272CC0 */ HSD_JObj* it_80272CC0(Item_GObj*, enum_t);
Expand All @@ -37,7 +38,6 @@
/* 276CEC */ void it_80276CEC(HSD_GObj*);
/* 276FC4 */ void it_80276FC4(HSD_GObj*);
/* 277040 */ bool it_80277040(Item_GObj*);
/* 277040 */ bool it_80277040(Item_GObj*);
/* 277544 */ bool it_80277544(HSD_GObj*);
/* 27781C */ bool it_8027781C(Item_GObj*);
/* 2787B4 */ void it_802787B4(Item_GObj*, s32);
Expand All @@ -48,8 +48,8 @@
/* 27A13C */ void it_8027A13C(Item_GObj*);
/* 27ADEC */ M2C_UNK it_8027ADEC(M2C_UNK, Item_GObj*, HSD_JObj*, f32);
/* 27B070 */ void it_8027B070(Item_GObj* gobj, Fighter_GObj* owner_gobj);
/* 27B730 */ void it_8027B730(void);
/* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float);
/* 27B730 */ void it_8027B730(void);
/* 27B798 */ s32 it_8027B798(Item_GObj*, Vec3*);
/* 27C56C */ void it_8027C56C(Item_GObj*, f32);
/* 27C8B0 */ void it_8027C8B0(Item_GObj*);
Expand Down
Loading
Loading