Skip to content

Commit c9b8baf

Browse files
Kelebek1Kelebek1
committed
fragment38
1 parent 8ca215e commit c9b8baf

File tree

11 files changed

+1865
-108
lines changed

11 files changed

+1865
-108
lines changed

‎include/sections.h

+1
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ extern u8 fragment54_relocs_ROM_END[];
337337
extern u8 fragment55_TEXT_START[];
338338
extern u8 fragment55_ROM_START[];
339339
extern u8 fragment55_ROM_END[];
340+
extern u8 fragment55_relocs_ROM_END[];
340341

341342
// fragment 56
342343
extern u8 fragment56_TEXT_START[];

‎include/variables.h

+32
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,38 @@ extern u8 D_300C340[];
212212
extern u8 D_300C3C0[];
213213
extern u8 D_300C440[];
214214
extern u8 D_300C4C0[];
215+
extern u8 D_3028E00[];
216+
extern u8 D_3029A80[];
217+
extern u8 D_302A700[];
218+
extern u8 D_302B380[];
219+
extern u8 D_2000C80[];
220+
extern u8 D_2000D80[];
221+
extern u8 D_2000E80[];
222+
extern u8 D_2000F80[];
223+
extern u8 D_2006C00[];
224+
extern u8 D_2007500[];
225+
extern u8 D_20003C0[];
226+
extern u8 D_20005C0[];
227+
extern u8 D_20002C0[];
228+
extern u8 D_2000300[];
229+
extern u8 D_2000340[];
230+
extern u8 D_2000380[];
231+
extern u8 D_3024C80[];
232+
extern u8 D_30260C0[];
233+
extern u8 D_2000B40[];
234+
extern u8 D_2000B80[];
235+
extern u8 D_2000BC0[];
236+
extern u8 D_2000C00[];
237+
extern u8 D_302C000[];
238+
extern u8 D_20287E0[];
239+
extern u8 D_2028860[];
240+
extern u8 D_20288E0[];
241+
extern u8 D_2028960[];
242+
extern u8 D_302FBC0[];
243+
extern u8 D_30300C0[];
244+
extern u8 D_30242C0[];
245+
extern u8 D_30243A0[];
246+
extern u8 D_302EBC0[];
215247

216248
extern u8 D_800818E0[0x20];
217249

‎linker_scripts/us/symbol_addrs.txt

+37-1
Original file line numberDiff line numberDiff line change
@@ -438,4 +438,40 @@ D_300C340 = 0x300C340;
438438
D_300C3C0 = 0x300C3C0;
439439
D_300C440 = 0x300C440;
440440
D_300C4C0 = 0x300C4C0;
441-
D_83407AC8 = 0x83407AC8; // size:0x1A
441+
D_83407AC8 = 0x83407AC8; // size:0x1A
442+
D_3028E00 = 0x3028E00;
443+
D_3029A80 = 0x3029A80;
444+
D_302A700 = 0x302A700;
445+
D_302B380 = 0x302B380;
446+
D_2000C80 = 0x2000C80;
447+
D_2000D80 = 0x2000D80;
448+
D_2000E80 = 0x2000E80;
449+
D_2000F80 = 0x2000F80;
450+
D_2006C00 = 0x2006C00;
451+
D_2007500 = 0x2007500;
452+
D_20003C0 = 0x20003C0;
453+
D_20005C0 = 0x20005C0;
454+
D_20002C0 = 0x20002C0;
455+
D_2000300 = 0x2000300;
456+
D_2000340 = 0x2000340;
457+
D_2000380 = 0x2000380;
458+
D_3024C80 = 0x3024C80;
459+
D_30260C0 = 0x30260C0;
460+
D_2000B40 = 0x2000B40;
461+
D_2000B80 = 0x2000B80;
462+
D_2000BC0 = 0x2000BC0;
463+
D_2000C00 = 0x2000C00;
464+
D_302C000 = 0x302C000;
465+
D_20287E0 = 0x20287E0;
466+
D_2028860 = 0x2028860;
467+
D_20288E0 = 0x20288E0;
468+
D_2028960 = 0x2028960;
469+
D_302FBC0 = 0x302FBC0;
470+
D_30300C0 = 0x30300C0;
471+
D_30242C0 = 0x30242C0;
472+
D_30243A0 = 0x30243A0;
473+
D_302EBC0 = 0x302EBC0;
474+
D_82305A28 = 0x82305A28; // size:0x8
475+
D_82305A50 = 0x82305A50; // size:0x1C
476+
D_82305920 = 0x82305920; // size:0x50
477+
D_82305978 = 0x82305978; // size:0x38

‎linker_scripts/us/undefined_syms.ld

+33-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,36 @@ D_300BF00 = 0x300BF00;
8383
D_300C340 = 0x300C340;
8484
D_300C3C0 = 0x300C3C0;
8585
D_300C440 = 0x300C440;
86-
D_300C4C0 = 0x300C4C0;
86+
D_300C4C0 = 0x300C4C0;
87+
D_3028E00 = 0x3028E00;
88+
D_3029A80 = 0x3029A80;
89+
D_302A700 = 0x302A700;
90+
D_302B380 = 0x302B380;
91+
D_2000C80 = 0x2000C80;
92+
D_2000D80 = 0x2000D80;
93+
D_2000E80 = 0x2000E80;
94+
D_2000F80 = 0x2000F80;
95+
D_2006C00 = 0x2006C00;
96+
D_2007500 = 0x2007500;
97+
D_20003C0 = 0x20003C0;
98+
D_20005C0 = 0x20005C0;
99+
D_20002C0 = 0x20002C0;
100+
D_2000300 = 0x2000300;
101+
D_2000340 = 0x2000340;
102+
D_2000380 = 0x2000380;
103+
D_3024C80 = 0x3024C80;
104+
D_30260C0 = 0x30260C0;
105+
D_2000B40 = 0x2000B40;
106+
D_2000B80 = 0x2000B80;
107+
D_2000BC0 = 0x2000BC0;
108+
D_2000C00 = 0x2000C00;
109+
D_302C000 = 0x302C000;
110+
D_20287E0 = 0x20287E0;
111+
D_2028860 = 0x2028860;
112+
D_20288E0 = 0x20288E0;
113+
D_2028960 = 0x2028960;
114+
D_302FBC0 = 0x302FBC0;
115+
D_30300C0 = 0x30300C0;
116+
D_30242C0 = 0x30242C0;
117+
D_30243A0 = 0x30243A0;
118+
D_302EBC0 = 0x302EBC0;

‎src/22630.c

+4-43
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,6 @@
77
#include "src/hal_libc.h"
88
#include "src/util.h"
99

10-
typedef struct unk_D_800AC910_50 {
11-
/* 0x000 */ char unk000[0x18];
12-
/* 0x018 */ u8 unk_018[11];
13-
/* 0x023 */ char unk023[0x62];
14-
/* 0x085 */ u8 unk_085;
15-
/* 0x086 */ char unk086[0x4];
16-
/* 0x08A */ u8 unk_08A;
17-
/* 0x08B */ char unk08B[0x3EC];
18-
/* 0x477 */ s8 unk_477;
19-
/* 0x478 */ char unk478[0xA5];
20-
/* 0x51D */ s8 unk_51D;
21-
/* 0x51E */ char unk51E[0x48E];
22-
/* 0x9AC */ u8 unk_9AC;
23-
/* 0x9AB */ char unk9AB[0x5F6];
24-
/* 0xFA1 */ u8 unk_FA1;
25-
/* 0xFA2 */ char unkFA2[0x1E];
26-
} unk_D_800AC910_50; // size = 0xFC0
27-
28-
typedef struct unk_D_800AC910_40 {
29-
/* 0x00 */ u16 unk_00;
30-
/* 0x02 */ char unk_02[11];
31-
} unk_D_800AC910_40;
32-
33-
typedef struct unk_D_800AC910 {
34-
/* 0x00 */ u16 unk_00;
35-
/* 0x02 */ u8 unk_02;
36-
/* 0x03 */ u8 unk_03;
37-
/* 0x04 */ u8 unk_04;
38-
/* 0x05 */ u8 unk_05;
39-
/* 0x06 */ char unk06[0x13];
40-
/* 0x19 */ u8 unk_019[0x20];
41-
/* 0x39 */ char unk39[0x7];
42-
/* 0x40 */ u16 unk_40;
43-
/* 0x42 */ char unk_42[11];
44-
/* 0x4D */ u8 unk_4D[2];
45-
/* 0x50 */ unk_D_800AC910_50* unk_50;
46-
/* 0x54 */ void* unk_54;
47-
} unk_D_800AC910; // size = 0x58
48-
4910
extern unk_D_80070F84 D_80070F84[];
5011

5112
extern unk_D_800AC910 D_800AC910[];
@@ -672,7 +633,7 @@ s32 func_800240A0(void) {
672633
var_s0->unk_02 = 0;
673634
var_s0->unk_05 = 0;
674635

675-
var_s0->unk_40 = 0x5000;
636+
var_s0->unk_40.unk_00 = 0x5000;
676637

677638
for (j = 0; j < 11; j++) {
678639
var_s0->unk_42[j] = '\x00';
@@ -772,9 +733,9 @@ s32 func_80024FB0(s32 arg0) {
772733
return 0;
773734
}
774735

775-
D_800AC910[arg0].unk_40 = func_80021A30(&D_800AC910[arg0].unk_50->unk_085);
776-
_bcopy(&D_800AC910[arg0].unk_50->unk_018, &D_800AC910[arg0].unk_42, 0xB);
777-
bzero(D_800AC910[arg0].unk_4D, 3);
736+
D_800AC910[arg0].unk_40.unk_00 = func_80021A30(&D_800AC910[arg0].unk_50->unk_085);
737+
_bcopy(&D_800AC910[arg0].unk_50->unk_018, &D_800AC910[arg0].unk_40.unk_02, 0xB);
738+
bzero(D_800AC910[arg0].unk_40.unk_0D, 3);
778739
return 1;
779740
}
780741

‎src/22630.h

+42
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,45 @@ typedef struct unk_func_8820BE14_sp {
9797
/* 0x53 */ u8 unk_53;
9898
} unk_func_8820BE14_sp; // size = 0x54
9999

100+
typedef struct unk_D_800AC910_50 {
101+
/* 0x000 */ char unk000[0x18];
102+
/* 0x018 */ u8 unk_018[11];
103+
/* 0x023 */ char unk023[0x62];
104+
/* 0x085 */ u8 unk_085;
105+
/* 0x086 */ char unk086[0x4];
106+
/* 0x08A */ u8 unk_08A;
107+
/* 0x08B */ char unk08B[0x3EC];
108+
/* 0x477 */ s8 unk_477;
109+
/* 0x478 */ char unk478[0xA5];
110+
/* 0x51D */ s8 unk_51D;
111+
/* 0x51E */ char unk51E[0x48E];
112+
/* 0x9AC */ u8 unk_9AC;
113+
/* 0x9AB */ char unk9AB[0x5F6];
114+
/* 0xFA1 */ u8 unk_FA1;
115+
/* 0xFA2 */ char unkFA2[0x1E];
116+
} unk_D_800AC910_50; // size = 0xFC0
117+
118+
typedef struct unk_D_800AC910_040 {
119+
/* 0x00 */ u16 unk_00;
120+
/* 0x02 */ char unk_02[11];
121+
/* 0x0D */ u8 unk_0D[2];
122+
/* 0x0F */ char unkF[0x1];
123+
} unk_D_800AC910_040; // size = 0x10
124+
125+
typedef struct unk_D_800AC910 {
126+
/* 0x00 */ u16 unk_00;
127+
/* 0x02 */ u8 unk_02;
128+
/* 0x03 */ u8 unk_03;
129+
/* 0x04 */ u8 unk_04;
130+
/* 0x05 */ u8 unk_05;
131+
/* 0x06 */ char unk06[0x13];
132+
/* 0x19 */ u8 unk_019[0x20];
133+
/* 0x39 */ char unk39[0x7];
134+
/* 0x40 */ unk_D_800AC910_040 unk_40;
135+
/* 0x50 */ unk_D_800AC910_50* unk_50;
136+
/* 0x54 */ void* unk_54;
137+
} unk_D_800AC910; // size = 0x58
138+
100139
u16 func_80021A30(u8* arg0);
101140
u32 func_80021A48(u8* arg0);
102141
void func_80021A68(u8* arg0, s32 arg1);
@@ -119,6 +158,7 @@ u32 func_800224B8(s32 arg0, u16 arg1);
119158
u16 func_800226C0(s32 arg0, u32 arg1);
120159
void func_80022734(unk_func_8820BE14_sp*);
121160
void func_800228B0(unk_func_8820BE14_sp*);
161+
s16 func_80022A04(u16*, unk_D_800AC910_040*);
122162
s8 func_80022A28(s32);
123163
u8 func_80022A38(s32 arg0);
124164
u8 func_80022A60(s32 arg0);
@@ -148,10 +188,12 @@ s32 func_800243D8(s32);
148188
void func_8002447C(s32);
149189
void func_800244F4(s32);
150190
s32 func_80024A48(s32, s32, s32);
191+
void func_80024CB0(s32, s32, s32, s32, unk_func_80026268_arg0*);
151192
s32 func_80024EF4(void);
152193
s32 func_80024F00(s32);
153194
u8 func_80024F68(s32);
154195
s32 func_80024FB0(s32 arg0);
196+
void func_80025040(s16, unk_D_800AC910_040*);
155197
s32 func_80025084(s32);
156198
s32 func_8002513C(s32);
157199
char* func_800251B0(s32, char*);

‎src/F420.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Vec3s D_8006F05C = { 0, 0, 0 };
88
Vec3f D_8006F064 = { 1.0f, 1.0f, 1.0f };
99
u16 D_8006F070[] = { 1, 1, 1 };
1010

11-
Color_RGBA8_u32* func_8000E820(Color_RGBA8_u32* arg0, u8 r, u8 g, u8 b) {
11+
Color_RGBA8* func_8000E820(Color_RGBA8* arg0, u8 r, u8 g, u8 b) {
1212
arg0->r = r;
1313
arg0->g = g;
1414
arg0->b = b;
1515

1616
return arg0;
1717
}
1818

19-
Color_RGBA8_u32* func_8000E840(Color_RGBA8_u32* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) {
19+
Color_RGBA8* func_8000E840(Color_RGBA8* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) {
2020
arg0->r = arg1;
2121
arg0->g = arg2;
2222
arg0->b = arg3;

‎src/F420.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ extern Vec3s D_8006F05C;
1717
extern Vec3f D_8006F064;
1818
extern u16 D_8006F070[];
1919

20-
Color_RGBA8_u32* func_8000E820(Color_RGBA8_u32* arg0, u8 r, u8 g, u8 b);
21-
Color_RGBA8_u32* func_8000E840(Color_RGBA8_u32* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4);
20+
Color_RGBA8* func_8000E820(Color_RGBA8* arg0, u8 r, u8 g, u8 b);
21+
Color_RGBA8* func_8000E840(Color_RGBA8* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4);
2222
Vec3f* func_8000E868(Vec3f* arg0, f32 arg1, f32 arg2, f32 arg3);
2323
Vec3f* func_8000E88C(Vec3f* arg0, f32 arg1, f32 arg2, f32 arg3);
2424
Vec3f* func_8000E8B0(Vec3f* arg0, Vec3f* arg1);

0 commit comments

Comments
 (0)