Skip to content

Commit

Permalink
Link itfflower (doldecomp#1382)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wyatt-avilla
wyatt-avilla authored Mar 25, 2024
1 parent 7b0f9f1 commit 08d2216
Show file tree
Hide file tree
Showing 13 changed files with 395 additions and 791 deletions.
766 changes: 0 additions & 766 deletions asm/melee/it/items/itfflower.s
View file

This file was deleted.

38 changes: 19 additions & 19 deletions config/GALE01/symbols.txt
View file
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
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
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
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
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
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
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

0 comments on commit 08d2216

Please sign in to comment.