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

itcoin #1380

Merged
merged 44 commits into from
Mar 15, 2024
Merged

itcoin #1380

Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4c63f5c
dump all functions and clean matches + table.
wyatt-avilla Mar 9, 2024
7d14763
create `CoinVars` and add to `xDD4_itemVar` in `struct Item`
wyatt-avilla Mar 9, 2024
0f5633f
match `it_802F14E4`
wyatt-avilla Mar 9, 2024
e31c3a4
match `it_802F1518`. also declaration changes for externed functions
wyatt-avilla Mar 9, 2024
5246c4b
match `it_802F15B8`
wyatt-avilla Mar 9, 2024
54c832e
match `it_802F1888`
wyatt-avilla Mar 9, 2024
10d21b2
match `it_802F2020`
wyatt-avilla Mar 9, 2024
d78988e
match the logic for `it_802F202C`. maybe missing global/exeterned float
wyatt-avilla Mar 9, 2024
d713da1
match `it_802F1F48` and modify `padding_x7C` in `struct Item`
wyatt-avilla Mar 9, 2024
c00a1f1
match `it_802F1C70` and add `itCoinAttributes`
wyatt-avilla Mar 9, 2024
3db8035
replace M2C fields with `attr` access in `it_802F1910`
wyatt-avilla Mar 9, 2024
47d0712
float replacement in `it_802F1910`
wyatt-avilla Mar 9, 2024
b50f775
99% of `it_802F1910`
wyatt-avilla Mar 9, 2024
c1091cc
match `it_802F13B4`
wyatt-avilla Mar 9, 2024
f1f1963
use `GET_JOBJ` in `it_802F1888`
wyatt-avilla Mar 9, 2024
1df44d4
match 77% of `it_802F1CE0` using inlines
wyatt-avilla Mar 9, 2024
a380808
match 77% of `it_802F1630`. same issues as `it_802F1CE0`
wyatt-avilla Mar 9, 2024
aceb8aa
clean `it_802F2094` with inlines
wyatt-avilla Mar 9, 2024
476fa6c
remove externed floats
wyatt-avilla Mar 9, 2024
a389a6e
98% of `it_802F2094`. register allocation moment
wyatt-avilla Mar 9, 2024
15db3d7
function declarations
wyatt-avilla Mar 9, 2024
5c0a802
remove `M2C_FIELD` in `it_802F13B4`
wyatt-avilla Mar 9, 2024
04dd1a0
change declaration for `it_802F2094` in `it_27CF.h`
wyatt-avilla Mar 9, 2024
27c827e
fix usages for `it_802F2094`
wyatt-avilla Mar 9, 2024
98422f8
scopes in `symbols.txt`
wyatt-avilla Mar 10, 2024
c9490ce
92% of `it_802F202C`
wyatt-avilla Mar 10, 2024
8122f7e
fix floats in `it_802F1F48`
wyatt-avilla Mar 10, 2024
5857616
match `it_802F2094`
wyatt-avilla Mar 13, 2024
b941ce4
match `it_802F202C`
wyatt-avilla Mar 13, 2024
51c0467
remove `M2C_FIELD` in `it_802F13B4`
wyatt-avilla Mar 13, 2024
6b164f7
if statement clarity in `it_802F1910`
wyatt-avilla Mar 15, 2024
da338c4
fix comment for `un_8031C5E4`
wyatt-avilla Mar 15, 2024
c5f1914
update `grfigureget.h`
wyatt-avilla Mar 15, 2024
1fb7e5f
update `gm_1601.h`
wyatt-avilla Mar 15, 2024
9958514
update `grfigureget.h` again
wyatt-avilla Mar 15, 2024
7686a8a
update `it_2725.h`
wyatt-avilla Mar 15, 2024
bd6efa5
update `tydisplay.h`
wyatt-avilla Mar 15, 2024
fdccb3c
fix typo functions and update declaration for `un_8031C5E4`
wyatt-avilla Mar 15, 2024
81bcd64
float scopes
wyatt-avilla Mar 15, 2024
5ba31de
revert scope for `it_804DD9B0 `
wyatt-avilla Mar 15, 2024
f29214d
declaration fix in `grfigureget.h`
wyatt-avilla Mar 15, 2024
b7b6946
run `gen_header` for `tydisplay.h`
wyatt-avilla Mar 15, 2024
703726f
proper type usage
wyatt-avilla Mar 15, 2024
b69edb4
Update src/melee/ty/tydisplay.h
wyatt-avilla Mar 15, 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
50 changes: 25 additions & 25 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17376,30 +17376,30 @@ it_802F13B0 = .text:0x802F13B0; // type:function size:0x4 scope:global
it_802F13B4 = .text:0x802F13B4; // type:function size:0x130 scope:global
it_802F14E4 = .text:0x802F14E4; // type:function size:0x34 scope:global
it_802F1518 = .text:0x802F1518; // type:function size:0x70 scope:global
it_802F1588 = .text:0x802F1588; // type:function size:0x28 scope:global
it_802F15B0 = .text:0x802F15B0; // type:function size:0x8 scope:global
it_802F15B8 = .text:0x802F15B8; // type:function size:0x4C scope:global
it_802F1604 = .text:0x802F1604; // type:function size:0x2C scope:global
it_802F1630 = .text:0x802F1630; // type:function size:0x220 scope:global
it_802F1850 = .text:0x802F1850; // type:function size:0x8 scope:global
it_802F1858 = .text:0x802F1858; // type:function size:0x4 scope:global
it_802F185C = .text:0x802F185C; // type:function size:0x2C scope:global
it_802F1588 = .text:0x802F1588; // type:function size:0x28 scope:local
it_802F15B0 = .text:0x802F15B0; // type:function size:0x8 scope:local
it_802F15B8 = .text:0x802F15B8; // type:function size:0x4C scope:local
it_802F1604 = .text:0x802F1604; // type:function size:0x2C scope:local
it_802F1630 = .text:0x802F1630; // type:function size:0x220 scope:local
it_802F1850 = .text:0x802F1850; // type:function size:0x8 scope:local
it_802F1858 = .text:0x802F1858; // type:function size:0x4 scope:local
it_802F185C = .text:0x802F185C; // type:function size:0x2C scope:local
it_802F1888 = .text:0x802F1888; // type:function size:0x5C scope:global
it_802F18E4 = .text:0x802F18E4; // type:function size:0x8 scope:global
it_802F18EC = .text:0x802F18EC; // type:function size:0x4 scope:global
it_802F18E4 = .text:0x802F18E4; // type:function size:0x8 scope:local
it_802F18EC = .text:0x802F18EC; // type:function size:0x4 scope:local
it_802F18F0 = .text:0x802F18F0; // type:function size:0x20 scope:global
it_802F1910 = .text:0x802F1910; // type:function size:0x358 scope:global
it_802F1C68 = .text:0x802F1C68; // type:function size:0x8 scope:global
it_802F1C70 = .text:0x802F1C70; // type:function size:0x44 scope:global
it_802F1CB4 = .text:0x802F1CB4; // type:function size:0x2C scope:global
it_802F1C68 = .text:0x802F1C68; // type:function size:0x8 scope:local
it_802F1C70 = .text:0x802F1C70; // type:function size:0x44 scope:local
it_802F1CB4 = .text:0x802F1CB4; // type:function size:0x2C scope:local
it_802F1CE0 = .text:0x802F1CE0; // type:function size:0x204 scope:global
it_802F1EE4 = .text:0x802F1EE4; // type:function size:0x8 scope:global
it_802F1EEC = .text:0x802F1EEC; // type:function size:0x30 scope:global
it_802F1F1C = .text:0x802F1F1C; // type:function size:0x2C scope:global
it_802F1EE4 = .text:0x802F1EE4; // type:function size:0x8 scope:local
it_802F1EEC = .text:0x802F1EEC; // type:function size:0x30 scope:local
it_802F1F1C = .text:0x802F1F1C; // type:function size:0x2C scope:local
it_802F1F48 = .text:0x802F1F48; // type:function size:0x8C scope:global
it_802F1FD4 = .text:0x802F1FD4; // type:function size:0x8 scope:global
it_802F1FDC = .text:0x802F1FDC; // type:function size:0x4 scope:global
it_802F1FE0 = .text:0x802F1FE0; // type:function size:0x34 scope:global
it_802F1FD4 = .text:0x802F1FD4; // type:function size:0x8 scope:local
it_802F1FDC = .text:0x802F1FDC; // type:function size:0x4 scope:local
it_802F1FE0 = .text:0x802F1FE0; // type:function size:0x34 scope:local
it_802F2014 = .text:0x802F2014; // type:function size:0xC scope:global
it_802F2020 = .text:0x802F2020; // type:function size:0xC scope:global
it_802F202C = .text:0x802F202C; // type:function size:0x68 scope:global
Expand Down Expand Up @@ -33044,12 +33044,12 @@ it_804DD9A0 = .sdata2:0x804DD9A0; // type:object size:0x4 scope:global data:floa
it_804DD9A8 = .sdata2:0x804DD9A8; // type:object size:0x4 scope:global data:float
it_804DD9AC = .sdata2:0x804DD9AC; // type:object size:0x4 scope:global data:float
it_804DD9B0 = .sdata2:0x804DD9B0; // type:object size:0x4 scope:global data:float
it_804DD9B8 = .sdata2:0x804DD9B8; // type:object size:0x4 scope:global data:float
it_804DD9BC = .sdata2:0x804DD9BC; // type:object size:0x4 scope:global data:float
it_804DD9C0 = .sdata2:0x804DD9C0; // type:object size:0x4 scope:global data:float
it_804DD9C4 = .sdata2:0x804DD9C4; // type:object size:0x4 scope:global data:float
it_804DD9C8 = .sdata2:0x804DD9C8; // type:object size:0x8 scope:global data:double
it_804DD9D0 = .sdata2:0x804DD9D0; // type:object size:0x4 scope:global data:float
it_804DD9B8 = .sdata2:0x804DD9B8; // type:object size:0x4 scope:local data:float
it_804DD9BC = .sdata2:0x804DD9BC; // type:object size:0x4 scope:local data:float
it_804DD9C0 = .sdata2:0x804DD9C0; // type:object size:0x4 scope:local data:float
it_804DD9C4 = .sdata2:0x804DD9C4; // type:object size:0x4 scope:local data:float
it_804DD9C8 = .sdata2:0x804DD9C8; // type:object size:0x8 scope:local data:double
it_804DD9D0 = .sdata2:0x804DD9D0; // type:object size:0x4 scope:local data:float
it_804DD9D8 = .sdata2:0x804DD9D8; // type:object size:0x4 scope:global data:float
it_804DD9DC = .sdata2:0x804DD9DC; // type:object size:0x4 scope:global data:float
it_804DD9E0 = .sdata2:0x804DD9E0; // type:object size:0x8 scope:global data:double
Expand Down
1 change: 1 addition & 0 deletions src/melee/gm/gm_1601.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
/* 16C6C0 */ /* static */ UNK_RET gm_8016C6C0(UNK_PARAMS);
/* 16C75C */ /* static */ UNK_RET gm_8016C75C(UNK_PARAMS);
/* 17E068 */ bool gm_8017E068(void);
/* 17E280 */ M2C_UNK gm_8017E280(u16, M2C_UNK);
/* 18841C */ bool gm_8018841C(void);
/* 473A18 */ extern UNK_T gm_80473A18;

Expand Down
7 changes: 7 additions & 0 deletions src/melee/gr/grfigureget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#ifndef GALE01_219530
#define GALE01_219530

#include <platform.h>

#include <placeholder.h>

s32 grFigureGet_80219C50(s32);
M2C_UNK grFigureGet_80219C34(s32);

#endif
4 changes: 2 additions & 2 deletions src/melee/gr/ground.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2755,10 +2755,10 @@ void Ground_801C5878(void)
}
}

s32 Ground_801C58E0(s32 arg0, s32 arg1)
Item_GObj* Ground_801C58E0(s32 arg0, s32 arg1)
{
s32 tmp = arg0;
s32 result;
Item_GObj* result;
Vec3 sp10;
Ground_801C2D24(arg1, &sp10);
result = it_802F2094(0, &sp10, tmp, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/melee/gr/ground.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
/* 1C57F0 */ f32 Ground_801C57F0(void);
/* 1C5800 */ void Ground_801C5800(void);
/* 1C5840 */ s32 Ground_801C5840(void);
/* 1C58E0 */ s32 Ground_801C58E0(s32, s32);
/* 1C58E0 */ Item_GObj* Ground_801C58E0(s32, s32);
/* 1C5940 */ int Ground_801C5940(void);
/* 1C5A28 */ void Ground_801C5A28(void);
/* 1C5A60 */ void Ground_801C5A60(void);
Expand Down
31 changes: 31 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 @@ -185,4 +185,35 @@ typedef struct MewVars {
f32 xC;
} MewVars;

typedef struct itCoinAttributes {
f32 x0;
f32 x4;
f32 x8;
f32 xC;
f32 x10;
f32 x14;
f32 x18;
f32 x1C;
f32 x20;
f32 x24;
f32 x28;
f32 x2C;
f32 x30;
f32 x34;
f32 x38;
f32 x3C;
f32 x40;
f32 x44;
f32 x48;
} itCoinAttributes;

typedef struct CoinVars {
s32 x0;
s32 x4;
f32 x8;
f32 xC;
s32 x10;
s32 x14;
} CoinVars;

#endif
2 changes: 2 additions & 0 deletions src/melee/it/it_2725.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
/* 27ADEC */ M2C_UNK it_8027ADEC(M2C_UNK, Item_GObj*, HSD_JObj*, f32);
/* 27B070 */ void it_8027B070(Item_GObj* gobj, Fighter_GObj* owner_gobj);
/* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float);
/* 27B798 */ M2C_UNK it_8027B798(Item_GObj*, Vec3*);
/* 27C56C */ void it_8027C56C(Item_GObj*, f32);
/* 27C8B0 */ void it_8027C8B0(Item_GObj*);
/* 27CBFC */ f32 it_8027CBFC(Item_GObj*);
/* 27CE44 */ void it_8027CE44(Item_GObj*);
/* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43];
/* 3F23CC */ extern struct ItemLogicTable it_803F23CC[];
Expand Down
2 changes: 1 addition & 1 deletion src/melee/it/items/it_27CF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
/* 2F046C */ void it_802F046C(s32);
/* 2F0AE0 */ void it_802F0AE0(Item_GObj* fighter_gobj, Vec3*, Vec3*, enum_t,
bool, float facing_dir, float, float);
/* 2F2094 */ s32 it_802F2094(s32, Vec3*, s32, s32);
/* 2F2094 */ Item_GObj* it_802F2094(s32, Vec3*, s32, s32);
/* 2F3330 */ bool it_802F3330(Item_GObj*);
/* 2F3374 */ void it_802F3374(Item_GObj*, Item_GObj*);
/* 3F94A0 */ extern ItemStateTable it_803F94A0[];
Expand Down
Loading
Loading