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

Decomp work on itfoxblaster.s #1427

Merged
merged 6 commits into from
Aug 12, 2024
Merged

Decomp work on itfoxblaster.s #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d0f47f
Foxblaster decomp work
AaronB-Hub Aug 12, 2024
0abaa8b
Update .pre-commit-config.yaml
AaronB-Hub Aug 12, 2024
dc0d972
formatting
AaronB-Hub Aug 12, 2024
e16541a
More formatting
AaronB-Hub Aug 12, 2024
50672d5
Merge branch 'upstream-master' into AaronB-Hub/master
ribbanya Aug 12, 2024
afb7dae
Fix newline
ribbanya Aug 12, 2024
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
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
hooks:
- id: clang-format
15 changes: 15 additions & 0 deletions src/melee/ft/chara/ftFox/forward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,19 @@ typedef enum ftFx_Submotion {
ftFx_SM_SelfCount = ftFx_SM_Count - ftCo_SM_Count,
} ftFx_Submotion;

typedef enum ftFx_SpecialNIndex {
// msid = currASID - ftFx_MS_SpecialNStart;
ftFx_SpecialNIndex_Start,
ftFx_SpecialNIndex_Loop,
ftFx_SpecialNIndex_End,
ftFx_SpecialNIndex_AirStart,
ftFx_SpecialNIndex_AirLoop,
ftFx_SpecialNIndex_AirEnd,
// msid = currASID - ftCo_MS_CatchDash;
ftFx_SpecialNIndex_ThrowB,
ftFx_SpecialNIndex_ThrowHi,
ftFx_SpecialNIndex_ThrowLw,
// ftFx_SpecialNIndex_None,
} ftFx_SpecialNIndex;

#endif
10 changes: 5 additions & 5 deletions src/melee/ft/chara/ftKirby/ftKb_Init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,11 +468,11 @@
/* 0FDA68 */ void ftKb_SsSpecialN_Coll(ftKb_GObj* gobj);
/* 0FDAF0 */ void ftKb_SsSpecialAirNStart_Coll(ftKb_GObj* gobj);
/* 0FDB78 */ void ftKb_SsSpecialAirN_Coll(ftKb_GObj* gobj);
/* 0FDC00 */ void ftKb_SpecialNFx_800FDC00(ftKb_GObj* gobj);
/* 0FDC70 */ void ftKb_SpecialNFx_800FDC70(ftKb_GObj* gobj);
/* 0FDD14 */ void ftKb_SpecialNFx_800FDD14(ftKb_GObj* gobj);
/* 0FDD4C */ void ftKb_SpecialNFx_800FDD4C(ftKb_GObj* gobj);
/* 0FDDF4 */ void ftKb_SpecialNFx_800FDDF4(ftKb_GObj* gobj);
/* 0FDC00 */ void ftKb_SpecialNFx_800FDC00(ftKb_GObj* gobj, Vec3* vec);
/* 0FDC70 */ void ftKb_SpecialNFx_800FDC70(ftKb_GObj* gobj, Vec3* vec);
/* 0FDD14 */ bool ftKb_SpecialNFx_800FDD14(ftKb_GObj* gobj);
/* 0FDD4C */ ftFx_SpecialNIndex ftKb_SpecialNFx_800FDD4C(ftKb_GObj* gobj);
/* 0FDDF4 */ bool ftKb_SpecialNFx_800FDDF4(ftKb_GObj* gobj);
/* 0FDEB4 */ void ftKb_SpecialNFx_800FDEB4(ftKb_GObj* gobj);
/* 0FDEE0 */ void ftKb_SpecialNFx_800FDEE0(ftKb_GObj* gobj);
/* 0FDF30 */ void ftKb_SpecialNFx_800FDF30(ftKb_GObj* gobj);
Expand Down
34 changes: 34 additions & 0 deletions src/melee/it/itCharItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,40 @@
#include <dolphin/mtx/types.h>
#include <baselib/jobj.h>

typedef struct {
/* x0 */ s32 xDD4;
/* x4 */ s32 xDD8;
/* x8 */ s32 xDDC;
/* xC */ s32 xDE0;
/* x10 */ s32 xDE4;
/* x14 */ s32 xDE8;
/* x18 */ s32 xDEC;
/* x1C */ s32 xDF0;
/* x20 */ s32 xDF4;
/* x24 */ s32 xDF8;
/* x28 */ s32 xDFC;
/* x2C */ s32 xE00;
/* x30 */ s32 xE04;
/* x34 */ s32 xE08;
/* x38 */ s32 xE0C;
/* x3C */ s32 xE10;
/* x40 */ Vec3 xE14;
/* x4C */ Vec3 xE20;
/* x58 */ Vec3 xE2C;
/* x64 */ Vec3 xE38;
/* x70 */ Vec3 xE44;
/* x7C */ Vec3 xE50;
/* x88 */ f32 xE5C;
/* x8C */ f32 xE60;
/* x90 */ f32 xE64;
/* x94 */ f32 xE68;
/* x98 */ f32 xE6C;
/* x9C */ f32 xE70;
/* x100 */ s32 xE74;
/* x104 */ s32 xE78;
/* x108 */ HSD_GObj* xE7C;
} FoxBlasterVars;

typedef struct {
float xDD4;
float xDD8;
Expand Down
Loading
Loading