Skip to content

Commit

Permalink
Merge pull request #116 from Kelebek1/fragment10
Browse files Browse the repository at this point in the history 
fragment10
  • Loading branch information
@RevoSucks
RevoSucks committed Sep 4, 2024
2 parents 72cf1a2 + 449c5e2 commit d5af0f0
Show file tree
Hide file tree
Showing 20 changed files with 1,400 additions and 56 deletions.
20 changes: 10 additions & 10 deletions include/global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ typedef struct unk_D_86002F58_004_000_000 {
/* 0x14 */ s32 unk_14;
} unk_D_86002F58_004_000_000; // size = 0x18

typedef struct unk_D_86002F58_004_000_044 {
/* 0x00 */ char unk00[0xA];
/* 0x0A */ u16 unk_0A;
} unk_D_86002F58_004_000_044; // size >= 0xC

typedef struct unk_D_86002F58_004_000 {
/* 0x000 */ unk_D_86002F58_004_000_000 unk_000;
/* 0x018 */ s16 unk_018;
Expand All @@ -67,7 +72,7 @@ typedef struct unk_D_86002F58_004_000 {
/* 0x030 */ Vec3f unk_030;
/* 0x03C */ s32 unk_03C;
/* 0x040 */ s16 unk_040;
/* 0x044 */ s32 unk_044;
/* 0x044 */ unk_D_86002F58_004_000_044* unk_044;
/* 0x048 */ s32 unk_048;
/* 0x04C */ u32 unk_04C;
/* 0x050 */ char pad50[2];
Expand All @@ -82,9 +87,8 @@ typedef struct unk_D_86002F58_004_000 {
/* 0x0A4 */ char padA4[2];
/* 0x0A6 */ s8 unk_0A6;
/* 0x0A7 */ char padA7[5];
/* 0x0AC */ f32 unk_0AC;
/* 0x0B0 */ f32 unk_0B0;
/* 0x0B4 */ char padB4[0xB4];
/* 0x0AC */ Vec3f unk_0AC;
/* 0x0B8 */ char padB8[0xB0];
} unk_D_86002F58_004_000; // size = 0x168

typedef struct unk_D_86002F34_00C {
Expand All @@ -99,12 +103,8 @@ typedef struct unk_D_86002F34_00C {
/* 0x60 */ MtxF* unk_060;
/* 0x64 */ Vec3f unk_064;
/* 0x70 */ char pad70[0x38];
/* 0xA8 */ f32 unk_0A8;
/* 0xAC */ f32 unk_0AC;
/* 0xB0 */ f32 unk_0B0;
/* 0xB4 */ f32 unk_0B4;
/* 0xB8 */ f32 unk_0B8;
/* 0xBC */ f32 unk_0BC;
/* 0xA8 */ Vec3f unk_0A8;
/* 0xB4 */ Vec3f unk_0B4;
} unk_D_86002F34_00C; // size >= 0xC0

typedef struct unk_D_86002F34 {
Expand Down
6 changes: 6 additions & 0 deletions include/variables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,11 @@ extern u32 D_3008000;
extern u32 D_300C000;
extern u32 D_1003E78[];
extern u32 D_304F120[];
extern u16 D_87B000C0;
extern u16 D_87B000C4;
extern u8 D_87B000C8;
extern u8 D_87B000CC;
extern u8 D_87B000D0;
extern u8 D_87B000D4;

#endif
8 changes: 8 additions & 0 deletions linker_scripts/us/symbol_addrs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,11 @@ D_80079014 = 0x80079014;
D_3004000 = 0x3004000;
D_8780FCB8 = 0x8780FCB8; // size:0x20
D_8780FA68 = 0x8780FA68; // size:0x8
D_87B000E0 = 0x87B000E0;
D_87B000E4 = 0x87B000E4;
D_87B000E8 = 0x87B000E8;
D_87B000EC = 0x87B000EC;
D_87B000F0 = 0x87B000F0;
D_87B000F2 = 0x87B000F2;
D_87B000F4 = 0x87B000F4;
D_86402848 = 0x86402848;
2 changes: 1 addition & 1 deletion src/11BA0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ unk_D_86002F58_004_000* func_80011938(MainPoolState* arg0, unk_D_86002F58_004_00
arg1->unk_0A0 = -0x100;
arg1->unk_03C = -0x100;
arg1->unk_040 = 0;
arg1->unk_044 = 0;
arg1->unk_044 = NULL;
arg1->unk_048 = 0;
arg1->unk_04C = 0x10000;
arg1->unk_052 = 0;
Expand Down
8 changes: 8 additions & 0 deletions src/11BA0.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@ typedef struct unk_func_80011B94 {
/* 0x18 */ Gfx* unk_18;
} unk_func_80011B94; // size = 0x1C

typedef struct unk_D_86404778_190 {
/* 0x00 */ unk_D_86002F58_004_000_000 unk_00;
/* 0x18 */ Gfx* unk_18;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ f32 unk_28;
} unk_D_86404778_190; // size = 0x2C

unk_D_86002F58_004_000_000* func_8001103C(MainPoolState*, void*);
unk_D_86002F58_004_000* func_80011938(MainPoolState* arg0, unk_D_86002F58_004_000* arg1, s16 arg2, Vec3f* arg3, Vec3s* arg4, Vec3f* arg5);
unk_func_80011B94* func_80011B94(MainPoolState*, void*, s32, Gfx*);
unk_D_86404778_190* func_80011B10(MainPoolState*, s32, s32, s32, Vec3f*, f32);
void func_80012094(unk_D_86002F58_004_000_000*, unk_D_86002F58_004_000_000*);


Expand Down
1 change: 1 addition & 0 deletions src/17300.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

void func_800173CC(unk_D_86002F58_004_000*);
void func_800173DC(unk_D_86002F58_004_000*, s16, s32, s32);
void func_80017464(unk_D_86002F58_004_000*, s16);
s32 func_80017514(unk_D_86002F58_004_000*);

#endif // _17300_H_
1 change: 1 addition & 0 deletions src/18140.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

void func_80017788(unk_D_86002F58_004_000*);
void func_80017798(unk_D_86002F58_004_000*, s16, s32, s32);
void func_80017804(unk_D_86002F58_004_000*, s32);

#endif // _18140_H_
2 changes: 1 addition & 1 deletion src/1C720.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void func_8001BC34(unk_D_86002F58_004_000* arg0, s16 arg1, s16 arg2, unk_D_86002
arg0->unk_0A0 = -0x100;
arg0->unk_03C = -0x100;
arg0->unk_040 = -1;
arg0->unk_044 = 0;
arg0->unk_044 = NULL;
arg0->unk_054 = -1;
arg0->unk_058 = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/E890.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ void func_8000ED98(s32*);
void func_8000F2C4(MtxF*, MtxF*, Vec3s*);
void func_8000FDE4(MtxF*, MtxF*, Vec3f*);
void func_80010090(MtxF*, MtxF*);
void func_80010354(f32*, f32*, f32, s16, s32);
void func_80010354(Vec3f*, Vec3f*, f32, s16, s32);


#endif // _E890_H_
Loading

0 comments on commit d5af0f0

Please sign in to comment.