Skip to content

Commit

Permalink
Partially match ithassam (#1383)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wyatt-avilla
wyatt-avilla authored Apr 1, 2024
1 parent 08d2216 commit 0376056
Show file tree
Hide file tree
Showing 6 changed files with 425 additions and 28 deletions.
56 changes: 28 additions & 28 deletions config/GALE01/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16103,27 +16103,27 @@ it_802CDB0C = .text:0x802CDB0C; // type:function size:0x24 scope:global
it_802CDB30 = .text:0x802CDB30; // type:function size:0x88 scope:global
it_802CDBB8 = .text:0x802CDBB8; // type:function size:0x28 scope:global
it_802CDBE0 = .text:0x802CDBE0; // type:function size:0x7C scope:global
it_802CDC5C = .text:0x802CDC5C; // type:function size:0x4 scope:global
it_802CDC5C = .text:0x802CDC5C; // type:function size:0x4 scope:local
it_802CDC60 = .text:0x802CDC60; // type:function size:0x20 scope:global
it_802CDC80 = .text:0x802CDC80; // type:function size:0x34 scope:global
it_802CDCB4 = .text:0x802CDCB4; // type:function size:0x70 scope:global
it_802CDD24 = .text:0x802CDD24; // type:function size:0x54 scope:global
it_802CDD78 = .text:0x802CDD78; // type:function size:0x58 scope:global
it_802CDDD0 = .text:0x802CDDD0; // type:function size:0x4C scope:global
it_802CDE1C = .text:0x802CDE1C; // type:function size:0x10C scope:global
it_802CDF28 = .text:0x802CDF28; // type:function size:0xE0 scope:global
it_802CE008 = .text:0x802CE008; // type:function size:0xBC scope:global
it_802CE0C4 = .text:0x802CE0C4; // type:function size:0x244 scope:global
it_802CE308 = .text:0x802CE308; // type:function size:0xA0 scope:global
it_802CE3A8 = .text:0x802CE3A8; // type:function size:0x58 scope:global
it_802CE400 = .text:0x802CE400; // type:function size:0x188 scope:global
it_802CE588 = .text:0x802CE588; // type:function size:0x54 scope:global
it_802CE5DC = .text:0x802CE5DC; // type:function size:0x5C scope:global
it_802CE638 = .text:0x802CE638; // type:function size:0x8 scope:global
it_802CE640 = .text:0x802CE640; // type:function size:0x64 scope:global
it_802CE6A4 = .text:0x802CE6A4; // type:function size:0x24 scope:global
it_802CE6C8 = .text:0x802CE6C8; // type:function size:0x20 scope:global
it_802CE6E8 = .text:0x802CE6E8; // type:function size:0x28 scope:global
it_802CDC80 = .text:0x802CDC80; // type:function size:0x34 scope:local
it_802CDCB4 = .text:0x802CDCB4; // type:function size:0x70 scope:local
it_802CDD24 = .text:0x802CDD24; // type:function size:0x54 scope:local
it_802CDD78 = .text:0x802CDD78; // type:function size:0x58 scope:local
it_802CDDD0 = .text:0x802CDDD0; // type:function size:0x4C scope:local
it_802CDE1C = .text:0x802CDE1C; // type:function size:0x10C scope:local
it_802CDF28 = .text:0x802CDF28; // type:function size:0xE0 scope:local
it_802CE008 = .text:0x802CE008; // type:function size:0xBC scope:local
it_802CE0C4 = .text:0x802CE0C4; // type:function size:0x244 scope:local
it_802CE308 = .text:0x802CE308; // type:function size:0xA0 scope:local
it_802CE3A8 = .text:0x802CE3A8; // type:function size:0x58 scope:local
it_802CE400 = .text:0x802CE400; // type:function size:0x188 scope:local
it_802CE588 = .text:0x802CE588; // type:function size:0x54 scope:local
it_802CE5DC = .text:0x802CE5DC; // type:function size:0x5C scope:local
it_802CE638 = .text:0x802CE638; // type:function size:0x8 scope:local
it_802CE640 = .text:0x802CE640; // type:function size:0x64 scope:local
it_802CE6A4 = .text:0x802CE6A4; // type:function size:0x24 scope:local
it_802CE6C8 = .text:0x802CE6C8; // type:function size:0x20 scope:local
it_802CE6E8 = .text:0x802CE6E8; // type:function size:0x28 scope:local
it_802CE710 = .text:0x802CE710; // type:function size:0xBC scope:global
it_802CE7CC = .text:0x802CE7CC; // type:function size:0x4 scope:global
it_802CE7D0 = .text:0x802CE7D0; // type:function size:0x20 scope:global
Expand Down Expand Up @@ -23412,7 +23412,7 @@ it_803F7C70 = .data:0x803F7C70; // type:object size:0x30 scope:global
it_803F7CA0 = .data:0x803F7CA0; // type:object size:0x30 scope:global
it_803F7CD0 = .data:0x803F7CD0; // type:object size:0x28 scope:global
it_803F7CF8 = .data:0x803F7CF8; // type:object size:0x40 scope:global
it_803F7D38 = .data:0x803F7D38; // type:object size:0x28 scope:global
it_803F7D38 = .data:0x803F7D38; // type:object size:0x28 scope:local
it_803F7D60 = .data:0x803F7D60; // type:object size:0x30 scope:global
it_803F7D90 = .data:0x803F7D90; // type:object size:0x38 scope:global
it_803F7DC8 = .data:0x803F7DC8; // type:object size:0x20 scope:global
Expand Down Expand Up @@ -26587,8 +26587,8 @@ it_804D55E0 = .sdata:0x804D55E0; // type:object size:0x8 scope:global
it_804D55E8 = .sdata:0x804D55E8; // type:object size:0x8 scope:global
it_804D55F0 = .sdata:0x804D55F0; // type:object size:0x8 scope:global
it_804D55F8 = .sdata:0x804D55F8; // type:object size:0x8 scope:global
it_804D5600 = .sdata:0x804D5600; // type:object size:0x8 scope:global
it_804D5608 = .sdata:0x804D5608; // type:object size:0x8 scope:global
it_804D5600 = .sdata:0x804D5600; // type:object size:0x8 scope:local
it_804D5608 = .sdata:0x804D5608; // type:object size:0x8 scope:local
it_804D5610 = .sdata:0x804D5610; // type:object size:0x8 scope:global
it_804D5618 = .sdata:0x804D5618; // type:object size:0x8 scope:global
it_804D5620 = .sdata:0x804D5620; // type:object size:0x8 scope:global
Expand Down Expand Up @@ -32781,11 +32781,11 @@ it_804DD3C8 = .sdata2:0x804DD3C8; // type:object size:0x8 scope:global data:doub
it_804DD3D0 = .sdata2:0x804DD3D0; // type:object size:0x4 scope:global data:float
it_804DD3D4 = .sdata2:0x804DD3D4; // type:object size:0x4 scope:global data:float
it_804DD3D8 = .sdata2:0x804DD3D8; // type:object size:0x4 scope:global data:float
it_804DD3E0 = .sdata2:0x804DD3E0; // type:object size:0x4 scope:global data:float
it_804DD3E4 = .sdata2:0x804DD3E4; // type:object size:0x4 scope:global data:float
it_804DD3E8 = .sdata2:0x804DD3E8; // type:object size:0x8 scope:global data:double
it_804DD3F0 = .sdata2:0x804DD3F0; // type:object size:0x4 scope:global data:float
it_804DD3F4 = .sdata2:0x804DD3F4; // type:object size:0x4 scope:global data:float
it_804DD3E0 = .sdata2:0x804DD3E0; // type:object size:0x4 scope:local data:float
it_804DD3E4 = .sdata2:0x804DD3E4; // type:object size:0x4 scope:local data:float
it_804DD3E8 = .sdata2:0x804DD3E8; // type:object size:0x8 scope:local data:double
it_804DD3F0 = .sdata2:0x804DD3F0; // type:object size:0x4 scope:local data:float
it_804DD3F4 = .sdata2:0x804DD3F4; // type:object size:0x4 scope:local data:float
it_804DD3F8 = .sdata2:0x804DD3F8; // type:object size:0x4 scope:global data:float
it_804DD3FC = .sdata2:0x804DD3FC; // type:object size:0x4 scope:global data:float
it_804DD400 = .sdata2:0x804DD400; // type:object size:0x4 scope:global data:float
Expand Down
1 change: 1 addition & 0 deletions src/melee/cm/camera.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
/* 02F474 */ void Camera_8002F474(void);
/* 02F8F4 */ void Camera_8002F8F4(void);
/* 030740 */ void Camera_80030740(u8 r, u8 g, u8 b);
/* 030788 */ void Camera_80030788(Vec3*);
/* 030A50 */ void* Camera_80030A50(void);
/* 030A78 */ bool Camera_80030A78(void);
/* 030B24 */ bool Camera_80030B24(void);
Expand Down
16 changes: 16 additions & 0 deletions src/melee/it/itCommonItems.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <baselib/forward.h>

#include <placeholder.h>
#include <dolphin/mtx/types.h>

typedef struct {
bool x0;
Expand Down Expand Up @@ -222,4 +223,19 @@ typedef struct FFlowerVars {
uint x4;
} FFlowerVars;

typedef struct HassamVars {
f32 x0;
f32 x4;
f32 x8;
f32 xC;
f32 x10;
f32 x14;
s32 x18;
s32 x1C;
s32 x20;
u8 padding[0x5C - 0x20];
Vec3 x5C;
f32 x68;
} HassamVars;

#endif
2 changes: 2 additions & 0 deletions src/melee/it/it_2725.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <placeholder.h>

/* 272980 */ void it_80272980(Item_GObj*, f32);
/* 272CC0 */ HSD_JObj* it_80272CC0(Item_GObj*, enum_t);
/* 273408 */ void it_80273408(Item_GObj* gobj);
/* 273670 */ void it_80273670(HSD_GObj*, int, float);
Expand All @@ -28,6 +29,7 @@
/* 279FF8 */ void it_80279FF8(Item_GObj*);
/* 27A09C */ bool it_8027A09C(Item_GObj*);
/* 27A118 */ bool it_8027A118(Item_GObj*, void (*)(Item_GObj*));
/* 27A13C */ void it_8027A13C(Item_GObj*);
/* 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);
Expand Down
Loading

0 comments on commit 0376056

Please sign in to comment.