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

itfflower #1382

Merged
merged 40 commits into from
Mar 25, 2024
Merged

itfflower #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5dc9193
dump functions, add table
wyatt-avilla Mar 20, 2024
9e60cb6
match `it_80292E64` w/ weird conditional
wyatt-avilla Mar 20, 2024
d0bb701
match `it_80292E04`, but with type punning
wyatt-avilla Mar 20, 2024
5cc29d8
match `it_80292EAC`, w/ weird conditional
wyatt-avilla Mar 20, 2024
6cb7a88
clean `M2C_FIELD`s in `it_80292EF8`
wyatt-avilla Mar 20, 2024
df7dbc7
var names in `it_80292FF0`
wyatt-avilla Mar 20, 2024
b9bd3a6
`Item_GObj*` s/r
wyatt-avilla Mar 20, 2024
17e43ef
match `it_80293164` but w/ `goto`s
wyatt-avilla Mar 21, 2024
f25e276
94% of `it_802932AC`
wyatt-avilla Mar 21, 2024
762e3e1
use `FFlowerVars` in `it_80292E04`
wyatt-avilla Mar 21, 2024
19f11d4
91% of `it_80292F14`
wyatt-avilla Mar 21, 2024
3fb92d9
match `it_80293040`
wyatt-avilla Mar 21, 2024
a8ee06b
proper return type for `it_80293240`
wyatt-avilla Mar 21, 2024
b0b0ea9
consolidate weird conditional into inline
wyatt-avilla Mar 21, 2024
fee4669
match `it_8029355C`
wyatt-avilla Mar 21, 2024
18d1a7b
match `it_80292D48` besides relocation diff
wyatt-avilla Mar 22, 2024
0b30308
`const float` s/r
wyatt-avilla Mar 22, 2024
e1a2d2b
change `float` assignment based on address in `it_80292EF8`
wyatt-avilla Mar 22, 2024
4d36933
match `it_80292D48` and `.sdata2`
wyatt-avilla Mar 22, 2024
1568c1f
match `it_80292EF8` besides register allocation
wyatt-avilla Mar 22, 2024
f3f49ac
match `it_802932AC`. ty cuyler
wyatt-avilla Mar 22, 2024
ed4b7bd
adjust declaration for `it_802996D0` and move to `itlgunbeam.h`
wyatt-avilla Mar 22, 2024
24d85bc
match `it_80292EF8`
wyatt-avilla Mar 23, 2024
416ef8f
function scopes in `.c`/`.h` files
wyatt-avilla Mar 23, 2024
2ff5a7e
function scopes in `symbols.txt`
wyatt-avilla Mar 23, 2024
d57e381
float scopes in `symbols.txt`
wyatt-avilla Mar 23, 2024
bb77db7
includes for use of `it_80292D48`
wyatt-avilla Mar 23, 2024
2968b96
match `it_80292F14`
wyatt-avilla Mar 23, 2024
ea9b5db
refactor `msid_check` into `switch` statement
wyatt-avilla Mar 23, 2024
c125e5d
variable name in `it_80293040`
wyatt-avilla Mar 23, 2024
2f83c13
`switch` in `it_80292EAC`
wyatt-avilla Mar 23, 2024
826a0cf
`switch` in `it_80292E64`
wyatt-avilla Mar 23, 2024
dd6152f
better formatting for `switch` in `it_80292EAC`
wyatt-avilla Mar 23, 2024
bbe5312
add `default:` in `msid_check`
wyatt-avilla Mar 23, 2024
86cc1a4
remove `default`s
wyatt-avilla Mar 23, 2024
d98d407
update build files
wyatt-avilla Mar 23, 2024
acf5dd6
fix return in `it_80293444`
wyatt-avilla Mar 23, 2024
698a8a8
adjust return type for `it_8026DF34`
wyatt-avilla Mar 23, 2024
60b8368
includes in `it_26B1.c`
wyatt-avilla Mar 23, 2024
a406ba0
delete `fflower.s`
wyatt-avilla Mar 23, 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
766 changes: 0 additions & 766 deletions asm/melee/it/items/itfflower.s
View file
Open in desktop

This file was deleted.

38 changes: 19 additions & 19 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14459,30 +14459,30 @@ it_80292E64 = .text:0x80292E64; // type:function size:0x48 scope:global
it_80292EAC = .text:0x80292EAC; // type:function size:0x4C scope:global
it_80292EF8 = .text:0x80292EF8; // type:function size:0x1C scope:global
it_80292F14 = .text:0x80292F14; // type:function size:0xDC scope:global
it_80292FF0 = .text:0x80292FF0; // type:function size:0x50 scope:global
it_80293040 = .text:0x80293040; // type:function size:0xCC scope:global
it_8029310C = .text:0x8029310C; // type:function size:0x4 scope:global
it_80293110 = .text:0x80293110; // type:function size:0x2C scope:global
it_8029313C = .text:0x8029313C; // type:function size:0x28 scope:global
it_80293164 = .text:0x80293164; // type:function size:0xAC scope:global
it_80293210 = .text:0x80293210; // type:function size:0x30 scope:global
it_80293240 = .text:0x80293240; // type:function size:0x44 scope:global
it_80292FF0 = .text:0x80292FF0; // type:function size:0x50 scope:local
it_80293040 = .text:0x80293040; // type:function size:0xCC scope:local
it_8029310C = .text:0x8029310C; // type:function size:0x4 scope:local
it_80293110 = .text:0x80293110; // type:function size:0x2C scope:local
it_8029313C = .text:0x8029313C; // type:function size:0x28 scope:local
it_80293164 = .text:0x80293164; // type:function size:0xAC scope:local
it_80293210 = .text:0x80293210; // type:function size:0x30 scope:local
it_80293240 = .text:0x80293240; // type:function size:0x44 scope:local
it_80293284 = .text:0x80293284; // type:function size:0x28 scope:global
it_802932AC = .text:0x802932AC; // type:function size:0x114 scope:global
it_802933C0 = .text:0x802933C0; // type:function size:0x4 scope:global
it_802932AC = .text:0x802932AC; // type:function size:0x114 scope:local
it_802933C0 = .text:0x802933C0; // type:function size:0x4 scope:local
it_802933C4 = .text:0x802933C4; // type:function size:0x28 scope:global
it_802933EC = .text:0x802933EC; // type:function size:0x28 scope:global
it_80293414 = .text:0x80293414; // type:function size:0x30 scope:global
it_80293444 = .text:0x80293444; // type:function size:0x44 scope:global
it_80293414 = .text:0x80293414; // type:function size:0x30 scope:local
it_80293444 = .text:0x80293444; // type:function size:0x44 scope:local
it_80293488 = .text:0x80293488; // type:function size:0x24 scope:global
it_802934AC = .text:0x802934AC; // type:function size:0x24 scope:global
it_802934D0 = .text:0x802934D0; // type:function size:0x24 scope:global
it_802934F4 = .text:0x802934F4; // type:function size:0x20 scope:global
it_80293514 = .text:0x80293514; // type:function size:0x20 scope:global
it_80293534 = .text:0x80293534; // type:function size:0x28 scope:global
it_8029355C = .text:0x8029355C; // type:function size:0xAC scope:global
it_80293608 = .text:0x80293608; // type:function size:0x4 scope:global
it_8029360C = .text:0x8029360C; // type:function size:0x34 scope:global
it_8029355C = .text:0x8029355C; // type:function size:0xAC scope:local
it_80293608 = .text:0x80293608; // type:function size:0x4 scope:local
it_8029360C = .text:0x8029360C; // type:function size:0x34 scope:local
it_80293640 = .text:0x80293640; // type:function size:0x20 scope:global
it_80293660 = .text:0x80293660; // type:function size:0x1C scope:global
it_8029367C = .text:0x8029367C; // type:function size:0x68 scope:global
Expand Down Expand Up @@ -32381,10 +32381,10 @@ it_804DCAEC = .sdata2:0x804DCAEC; // type:object size:0x4 scope:global data:floa
it_804DCAF0 = .sdata2:0x804DCAF0; // type:object size:0x4 scope:global data:float
it_804DCAF8 = .sdata2:0x804DCAF8; // type:object size:0x4 scope:global data:float
it_804DCAFC = .sdata2:0x804DCAFC; // type:object size:0x4 scope:global data:float
it_804DCB00 = .sdata2:0x804DCB00; // type:object size:0x4 scope:global data:float
it_804DCB04 = .sdata2:0x804DCB04; // type:object size:0x4 scope:global data:float
it_804DCB08 = .sdata2:0x804DCB08; // type:object size:0x4 scope:global data:float
it_804DCB0C = .sdata2:0x804DCB0C; // type:object size:0x4 scope:global data:float
it_804DCB00 = .sdata2:0x804DCB00; // type:object size:0x4 scope:local data:float
it_804DCB04 = .sdata2:0x804DCB04; // type:object size:0x4 scope:local data:float
it_804DCB08 = .sdata2:0x804DCB08; // type:object size:0x4 scope:local data:float
it_804DCB0C = .sdata2:0x804DCB0C; // type:object size:0x4 scope:local data:float
it_804DCB10 = .sdata2:0x804DCB10; // type:object size:0x4 scope:global data:float
it_804DCB14 = .sdata2:0x804DCB14; // type:object size:0x4 scope:global data:float
it_804DCB18 = .sdata2:0x804DCB18; // type:object size:0x4 scope:global data:float
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 @@ -907,7 +907,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
Object(NonMatching, "melee/it/items/itsscope.c"),
Object(NonMatching, "melee/it/items/itstarrod.c"),
Object(NonMatching, "melee/it/items/itharisen.c"),
Object(NonMatching, "melee/it/items/itfflower.c"),
Object(Matching, "melee/it/items/itfflower.c"),
Object(NonMatching, "melee/it/items/itkinoko.c"),
Object(NonMatching, "melee/it/items/itdkinoko.c"),
Object(Matching, "melee/it/items/ithammer.c"),
Expand Down
2 changes: 1 addition & 1 deletion obj_files.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/asm/melee/it/items/itsscope.s.o\
$(BUILD_DIR)/asm/melee/it/items/itstarrod.s.o\
$(BUILD_DIR)/asm/melee/it/items/itharisen.s.o\
$(BUILD_DIR)/asm/melee/it/items/itfflower.s.o\
$(BUILD_DIR)/src/melee/it/items/itfflower.c.o\
$(BUILD_DIR)/asm/melee/it/items/itkinoko.s.o\
$(BUILD_DIR)/asm/melee/it/items/itdkinoko.s.o\
$(BUILD_DIR)/src/melee/it/items/ithammer.c.o\
Expand Down
5 changes: 5 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 @@ -217,4 +217,9 @@ typedef struct CoinVars {
int x14;
} CoinVars;

typedef struct FFlowerVars {
int x0;
uint x4;
} FFlowerVars;

#endif
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 @@ -17,7 +17,7 @@
/* 26D62C */ void it_8026D62C(Item_GObj*, HSD_GObjEvent);
/* 26D9A0 */ bool it_8026D9A0(Item_GObj*);
/* 26DA08 */ bool it_8026DA08(Item_GObj*);
/* 26DF34 */ s32 it_8026DF34(void);
/* 26DF34 */ bool it_8026DF34(void);
/* 26DFB0 */ bool it_8026DFB0(void);
/* 26E0F4 */ void it_8026E0F4(Item_GObj*);
/* 26E15C */ void it_8026E15C(Item_GObj*, HSD_GObjEvent);
Expand Down
1 change: 1 addition & 0 deletions src/melee/it/it_26B1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "it/item.h"
#include "it/items/it_27CF.h"
#include "it/items/itbat.h"
#include "it/items/itfflower.h"
#include "it/items/itmarumine.h"
#include "it/items/itsword.h"
#include "it/types.h"
Expand Down
1 change: 0 additions & 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 @@ -22,7 +22,6 @@
/* 28FE90 */ void it_8028FE90(Item_GObj*);
/* 290938 */ HSD_GObj* it_80290938(HSD_JObj*);
/* 291BE0 */ HSD_GObj* it_80291BE0(Vec3*);
/* 292D48 */ HSD_GObj* it_80292D48(Vec3*);
/* 294DC0 */ HSD_GObj* it_80294DC0(Vec3*);
/* 294E78 */ void it_80294E78(Item_GObj*, float);
/* 294EB0 */ void it_80294EB0(Item_GObj*, Vec3*, Vec3*);
Expand Down
Loading
Loading