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

match itnokonoko #1486

Merged
merged 2 commits into from
Dec 13, 2024
Merged

match itnokonoko #1486

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
a0dc834
match itnokonoko
thefoxcam Dec 4, 2024
e520972
mark inline as static
thefoxcam Dec 4, 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
82 changes: 41 additions & 41 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16510,47 +16510,47 @@ it_802DC480 = .text:0x802DC480; // type:function size:0x3C scope:global
it_802DC4BC = .text:0x802DC4BC; // type:function size:0x1E0 scope:global
it_802DC69C = .text:0x802DC69C; // type:function size:0xD8 scope:global
it_802DC774 = .text:0x802DC774; // type:function size:0xC8 scope:global
it_802DC83C = .text:0x802DC83C; // type:function size:0x7C scope:global
fn_802DC8B8 = .text:0x802DC8B8; // type:function size:0x58
it_802DC910 = .text:0x802DC910; // type:function size:0x8 scope:global
it_802DC918 = .text:0x802DC918; // type:function size:0x3C scope:global
it_802DC954 = .text:0x802DC954; // type:function size:0x3C scope:global
it_802DC990 = .text:0x802DC990; // type:function size:0xCC scope:global
it_802DCA5C = .text:0x802DCA5C; // type:function size:0x48 scope:global
it_802DCAA4 = .text:0x802DCAA4; // type:function size:0x90 scope:global
it_802DCB34 = .text:0x802DCB34; // type:function size:0x68 scope:global
it_802DCB9C = .text:0x802DCB9C; // type:function size:0xBC scope:global
it_802DCC58 = .text:0x802DCC58; // type:function size:0x8 scope:global
it_802DCC60 = .text:0x802DCC60; // type:function size:0x30 scope:global
it_802DCC90 = .text:0x802DCC90; // type:function size:0x3C scope:global
it_802DCCCC = .text:0x802DCCCC; // type:function size:0x88 scope:global
it_802DCD54 = .text:0x802DCD54; // type:function size:0x48 scope:global
it_802DCD9C = .text:0x802DCD9C; // type:function size:0x28 scope:global
it_802DCDC4 = .text:0x802DCDC4; // type:function size:0x3C scope:global
it_802DC83C = .text:0x802DC83C; // type:function size:0x7C scope:local
fn_802DC8B8 = .text:0x802DC8B8; // type:function size:0x58 scope:local
it_802DC910 = .text:0x802DC910; // type:function size:0x8 scope:local
it_802DC918 = .text:0x802DC918; // type:function size:0x3C scope:local
it_802DC954 = .text:0x802DC954; // type:function size:0x3C scope:local
it_802DC990 = .text:0x802DC990; // type:function size:0xCC scope:local
it_802DCA5C = .text:0x802DCA5C; // type:function size:0x48 scope:local
it_802DCAA4 = .text:0x802DCAA4; // type:function size:0x90 scope:local
it_802DCB34 = .text:0x802DCB34; // type:function size:0x68 scope:local
it_802DCB9C = .text:0x802DCB9C; // type:function size:0xBC scope:local
it_802DCC58 = .text:0x802DCC58; // type:function size:0x8 scope:local
it_802DCC60 = .text:0x802DCC60; // type:function size:0x30 scope:local
it_802DCC90 = .text:0x802DCC90; // type:function size:0x3C scope:local
it_802DCCCC = .text:0x802DCCCC; // type:function size:0x88 scope:local
it_802DCD54 = .text:0x802DCD54; // type:function size:0x48 scope:local
it_802DCD9C = .text:0x802DCD9C; // type:function size:0x28 scope:local
it_802DCDC4 = .text:0x802DCDC4; // type:function size:0x3C scope:local
it_802DCE00 = .text:0x802DCE00; // type:function size:0x74 scope:global
it_802DCE74 = .text:0x802DCE74; // type:function size:0x50 scope:global
it_802DCEC4 = .text:0x802DCEC4; // type:function size:0xF8 scope:global
it_802DCFBC = .text:0x802DCFBC; // type:function size:0xE4 scope:global
it_802DD0A0 = .text:0x802DD0A0; // type:function size:0x114 scope:global
it_802DD1B4 = .text:0x802DD1B4; // type:function size:0x28 scope:global
it_802DD1DC = .text:0x802DD1DC; // type:function size:0x80 scope:global
it_802DD25C = .text:0x802DD25C; // type:function size:0x8 scope:global
it_802DD264 = .text:0x802DD264; // type:function size:0x2C scope:global
it_802DD290 = .text:0x802DD290; // type:function size:0x4C scope:global
it_802DD2DC = .text:0x802DD2DC; // type:function size:0x4C scope:global
it_802DD328 = .text:0x802DD328; // type:function size:0x140 scope:global
it_802DD468 = .text:0x802DD468; // type:function size:0x4 scope:global
it_802DD46C = .text:0x802DD46C; // type:function size:0x3C scope:global
it_802DD4A8 = .text:0x802DD4A8; // type:function size:0x4C scope:global
it_802DCE74 = .text:0x802DCE74; // type:function size:0x50 scope:local
it_802DCEC4 = .text:0x802DCEC4; // type:function size:0xF8 scope:local
it_802DCFBC = .text:0x802DCFBC; // type:function size:0xE4 scope:local
it_802DD0A0 = .text:0x802DD0A0; // type:function size:0x114 scope:local
it_802DD1B4 = .text:0x802DD1B4; // type:function size:0x28 scope:local
it_802DD1DC = .text:0x802DD1DC; // type:function size:0x80 scope:local
it_802DD25C = .text:0x802DD25C; // type:function size:0x8 scope:local
it_802DD264 = .text:0x802DD264; // type:function size:0x2C scope:local
it_802DD290 = .text:0x802DD290; // type:function size:0x4C scope:local
it_802DD2DC = .text:0x802DD2DC; // type:function size:0x4C scope:local
it_802DD328 = .text:0x802DD328; // type:function size:0x140 scope:local
it_802DD468 = .text:0x802DD468; // type:function size:0x4 scope:local
it_802DD46C = .text:0x802DD46C; // type:function size:0x3C scope:local
it_802DD4A8 = .text:0x802DD4A8; // type:function size:0x4C scope:local
it_802DD4F4 = .text:0x802DD4F4; // type:function size:0x48 scope:global
it_802DD53C = .text:0x802DD53C; // type:function size:0x5C scope:global
it_802DD598 = .text:0x802DD598; // type:function size:0x4 scope:global
it_802DD53C = .text:0x802DD53C; // type:function size:0x5C scope:local
it_802DD598 = .text:0x802DD598; // type:function size:0x4 scope:local
it_802DD59C = .text:0x802DD59C; // type:function size:0xE0 scope:global
it_802DD67C = .text:0x802DD67C; // type:function size:0x58 scope:global
it_802DD6D4 = .text:0x802DD6D4; // type:function size:0x48 scope:global
it_802DD71C = .text:0x802DD71C; // type:function size:0x30 scope:global
it_802DD74C = .text:0x802DD74C; // type:function size:0x40 scope:global
it_802DD78C = .text:0x802DD78C; // type:function size:0x44 scope:global
it_802DD6D4 = .text:0x802DD6D4; // type:function size:0x48 scope:local
it_802DD71C = .text:0x802DD71C; // type:function size:0x30 scope:local
it_802DD74C = .text:0x802DD74C; // type:function size:0x40 scope:local
it_802DD78C = .text:0x802DD78C; // type:function size:0x44 scope:local
it_802DD7D0 = .text:0x802DD7D0; // type:function size:0x20 scope:global
it_802DD7F0 = .text:0x802DD7F0; // type:function size:0x294 scope:global
it_802DDA84 = .text:0x802DDA84; // type:function size:0xB4 scope:global
Expand Down Expand Up @@ -23217,7 +23217,7 @@ it_803F83F0 = .data:0x803F83F0; // type:object size:0x50 scope:global
it_803F8468 = .data:0x803F8468; // type:object size:0x160 scope:global
it_803F85C8 = .data:0x803F85C8; // type:object size:0x28 scope:global
it_803F85F0 = .data:0x803F85F0; // type:object size:0xB0 scope:global
it_803F86A0 = .data:0x803F86A0; // type:object size:0x28 scope:global
it_803F86A0 = .data:0x803F86A0; // type:object size:0x25 scope:local data:string
it_803F86C8 = .data:0x803F86C8; // type:object size:0x128 scope:global
it_803F87F0 = .data:0x803F87F0; // type:object size:0xD0 scope:global
it_803F88C0 = .data:0x803F88C0; // type:object size:0x80 scope:global
Expand Down Expand Up @@ -26381,8 +26381,8 @@ it_804D5638 = .sdata:0x804D5638; // type:object size:0x8 scope:global
@237 = .sdata:0x804D5648; // type:object size:0x5 scope:local data:string
it_804D5650 = .sdata:0x804D5650; // type:object size:0x8 scope:global
it_804D5658 = .sdata:0x804D5658; // type:object size:0x8 scope:global
it_804D5660 = .sdata:0x804D5660; // type:object size:0x8 scope:global
it_804D5668 = .sdata:0x804D5668; // type:object size:0x8 scope:global
it_804D5660 = .sdata:0x804D5660; // type:object size:0x7 scope:local data:string
it_804D5668 = .sdata:0x804D5668; // type:object size:0x5 scope:local data:string
it_804D5670 = .sdata:0x804D5670; // type:object size:0x8 scope:global
it_804D5678 = .sdata:0x804D5678; // type:object size:0x8 scope:global
it_804D5680 = .sdata:0x804D5680; // type:object size:0x8 scope:global
Expand Down Expand Up @@ -32669,7 +32669,7 @@ it_804DD624 = .sdata2:0x804DD624; // type:object size:0x4 scope:global data:floa
it_804DD628 = .sdata2:0x804DD628; // type:object size:0x4 scope:global data:float
it_804DD62C = .sdata2:0x804DD62C; // type:object size:0x4 scope:global data:float
it_804DD630 = .sdata2:0x804DD630; // type:object size:0x4 scope:global data:float
it_804DD634 = .sdata2:0x804DD634; // type:object size:0x4 scope:global data:float
it_804DD634 = .sdata2:0x804DD634; // type:object size:0x4 data:float
it_804DD638 = .sdata2:0x804DD638; // type:object size:0x8 scope:global data:double
it_804DD640 = .sdata2:0x804DD640; // type:object size:0x4 scope:global data:float
it_804DD648 = .sdata2:0x804DD648; // type:object size:0x8 scope:global data:double
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ def TRKLib(lib_name: str, objects: Objects) -> Library:
Object(Matching, "melee/it/items/itmato.c"),
Object(Matching, "melee/it/items/itheiho.c"),
Object(NonMatching, "melee/it/items/itlikelike.c"),
Object(NonMatching, "melee/it/items/itnokonoko.c"),
Object(Matching, "melee/it/items/itnokonoko.c"),
Object(NonMatching, "melee/it/items/itzgshell.c"),
Object(Matching, "melee/it/items/itzrshell.c"),
Object(NonMatching, "melee/it/items/itpatapata.c"),
Expand Down
58 changes: 58 additions & 0 deletions src/melee/it/itCommonItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
#include <common_structs.h>
#include <dolphin/mtx/types.h>

struct ECB {
f32 top;
f32 bottom;
f32 right;
f32 left;
};

typedef struct {
bool x0;
bool x4;
Expand Down Expand Up @@ -388,6 +395,57 @@ typedef struct itKinoko_ItemVars {
f32 xC;
} itKinoko_ItemVars;

typedef struct itNokoNoko_ItemVars {
f32 x0;
s32 x4;
f32 x8;
f32 xC;
f32 x10;
s32 x14;
s32 x18;
s32 x1C;
s32 x20;
s32 x24;
s32 x28;
s32 x2C;
s32 x30;
f32 x34;
f32 x38;
s32 x3C;
s32 x40;
s32 x44;
f32 x48;
f32 x4C;
f32 x50;
f32 x54;
f32 x58;
f32 x5C;
f32 x60;
f32 x64;
f32 x68;
f32 x6C;
f32 x70;
ECB x74;
f32 x84;
f32 x88;
f32 x8C;
f32 x90;
f32 x94;
f32 x98;
f32 x9C;
} itNokoNoko_ItemVars;

typedef struct itNokoNoko_DatAttrs2 {
s32 x0;
f32 x4;
} itNokoNoko_DatAttrs2;

typedef struct itNokoNoko_DatAttrs {
itNokoNoko_DatAttrs2* x0;
f32 x4;
f32 x8;
} itNokoNoko_DatAttrs;

typedef struct itTaruCann_DatAttrs {
/* +0 */ char pad_0[0x28];
/* +28 */ int x28;
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/it_2725.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3547,7 +3547,7 @@ void it_802762B0(Item* arg0)

/// #it_8027C56C

bool it_8027C794(void)
bool it_8027C794(Item_GObj* gobj)
{
return false;
}
Expand Down
18 changes: 9 additions & 9 deletions src/melee/it/it_2725.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
/* 274C60 */ UNK_RET it_80274C60(UNK_PARAMS);
/* 274C78 */ bool it_80274C78(Item_GObj* gobj);
/* 274C88 */ void it_80274C88(Item_GObj* gobj);
/* 274CAC */ UNK_RET it_80274CAC(UNK_PARAMS);
/* 274CAC */ void it_80274CAC(HSD_GObj*);
/* 274D04 */ UNK_RET it_80274D04(UNK_PARAMS);
/* 274D6C */ UNK_RET it_80274D6C(UNK_PARAMS);
/* 274DAC */ void it_80274DAC(Item_GObj*);
Expand All @@ -101,15 +101,15 @@
/* 275228 */ UNK_RET it_80275228(UNK_PARAMS);
/* 275240 */ UNK_RET it_80275240(UNK_PARAMS);
/* 275258 */ UNK_RET it_80275258(UNK_PARAMS);
/* 275270 */ UNK_RET it_80275270(UNK_PARAMS);
/* 275270 */ void it_80275270(Item_GObj*);
/* 275288 */ UNK_RET it_80275288(UNK_PARAMS);
/* 2752D8 */ UNK_RET it_802752D8(UNK_PARAMS);
/* 275328 */ UNK_RET it_80275328(UNK_PARAMS);
/* 275390 */ void it_80275390(Item_GObj*);
/* 2753BC */ void it_802753BC(Item_GObj*, s16);
/* 2753DC */ void it_802753DC(Item_GObj*);
/* 275414 */ void it_80275414(Item_GObj*);
/* 27542C */ UNK_RET it_8027542C(UNK_PARAMS);
/* 27542C */ void it_8027542C(Item_GObj*);
/* 275444 */ void it_80275444(Item_GObj*);
/* 275474 */ void it_80275474(Item_GObj* gobj);
/* 2754A4 */ void it_802754A4(Item_GObj*);
Expand Down Expand Up @@ -222,27 +222,27 @@
/* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*);
/* 27B508 */ UNK_RET it_8027B508(UNK_PARAMS);
/* 27B564 */ UNK_RET it_8027B564(UNK_PARAMS);
/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, s32, HSD_JObj*, Vec3*, s32);
/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, Vec3*, HSD_JObj*, Vec3*, s32);
/* 27B730 */ void it_8027B730(void);
/* 27B798 */ s32 it_8027B798(Item_GObj*, Vec3*);
/* 27B964 */ UNK_RET it_8027B964(UNK_PARAMS);
/* 27BA54 */ UNK_RET it_8027BA54(UNK_PARAMS);
/* 27BB1C */ UNK_RET it_8027BB1C(UNK_PARAMS);
/* 27BBF4 */ UNK_RET it_8027BBF4(UNK_PARAMS);
/* 27C0A8 */ UNK_RET it_8027C0A8(UNK_PARAMS);
/* 27C0A8 */ UNK_RET it_8027C0A8(Item_GObj*, f32, f32);
/* 27C0CC */ UNK_RET it_8027C0CC(UNK_PARAMS);
/* 27C0F0 */ UNK_RET it_8027C0F0(UNK_PARAMS);
/* 27C56C */ void it_8027C56C(Item_GObj*, f32);
/* 27C794 */ bool it_8027C794(void);
/* 27C794 */ bool it_8027C794(Item_GObj*);
/* 27C79C */ UNK_RET it_8027C79C(UNK_PARAMS);
/* 27C824 */ UNK_RET it_8027C824(UNK_PARAMS);
/* 27C8B0 */ void it_8027C8B0(Item_GObj*);
/* 27C8D0 */ UNK_RET it_8027C8D0(UNK_PARAMS);
/* 27C8D0 */ void it_8027C8D0(Vec3*, Vec3*, f32);
/* 27C9D8 */ UNK_RET it_8027C9D8(UNK_PARAMS);
/* 27CA7C */ UNK_RET it_8027CA7C(UNK_PARAMS);
/* 27CAD8 */ UNK_RET it_8027CAD8(UNK_PARAMS);
/* 27CAD8 */ void it_8027CAD8(Item_GObj*);
/* 27CB3C */ UNK_RET it_8027CB3C(UNK_PARAMS);
/* 27CBA4 */ UNK_RET it_8027CBA4(UNK_PARAMS);
/* 27CBA4 */ void it_8027CBA4(Item_GObj*);
/* 27CBFC */ f32 it_8027CBFC(Item_GObj*);
/* 27CC88 */ UNK_RET it_8027CC88(UNK_PARAMS);
/* 27CE18 */ UNK_RET it_8027CE18(UNK_PARAMS);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/items/itheiho.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ItemStateTable it_803F83F0[] = { { -1, it_802D88CC, it_802D88D4, it_802D8910 },

void it_802D8618(s32 arg0, Vec3* arg1, s32 arg2, s32 arg3)
{
Item_GObj* gobj = it_8027B5B0(0xD2, (s32) arg1, NULL, NULL, 1);
Item_GObj* gobj = it_8027B5B0(0xD2, arg1, NULL, NULL, 1);
Item* ip = GET_ITEM(gobj);
ip->xDD4_itemVar.heiho.x20 = (s8) arg0;
ip->xDD4_itemVar.heiho.x21 = (s8) arg2;
Expand Down
Loading
Loading