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

fragment38 #171

Merged
merged 1 commit into from
Mar 10, 2025
Merged

fragment38 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions include/sections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ extern u8 fragment54_relocs_ROM_END[];
extern u8 fragment55_TEXT_START[];
extern u8 fragment55_ROM_START[];
extern u8 fragment55_ROM_END[];
extern u8 fragment55_relocs_ROM_END[];

// fragment 56
extern u8 fragment56_TEXT_START[];
Expand Down
32 changes: 32 additions & 0 deletions include/variables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,38 @@ extern u8 D_300C340[];
extern u8 D_300C3C0[];
extern u8 D_300C440[];
extern u8 D_300C4C0[];
extern u8 D_3028E00[];
extern u8 D_3029A80[];
extern u8 D_302A700[];
extern u8 D_302B380[];
extern u8 D_2000C80[];
extern u8 D_2000D80[];
extern u8 D_2000E80[];
extern u8 D_2000F80[];
extern u8 D_2006C00[];
extern u8 D_2007500[];
extern u8 D_20003C0[];
extern u8 D_20005C0[];
extern u8 D_20002C0[];
extern u8 D_2000300[];
extern u8 D_2000340[];
extern u8 D_2000380[];
extern u8 D_3024C80[];
extern u8 D_30260C0[];
extern u8 D_2000B40[];
extern u8 D_2000B80[];
extern u8 D_2000BC0[];
extern u8 D_2000C00[];
extern u8 D_302C000[];
extern u8 D_20287E0[];
extern u8 D_2028860[];
extern u8 D_20288E0[];
extern u8 D_2028960[];
extern u8 D_302FBC0[];
extern u8 D_30300C0[];
extern u8 D_30242C0[];
extern u8 D_30243A0[];
extern u8 D_302EBC0[];

extern u8 D_800818E0[0x20];

Expand Down
38 changes: 37 additions & 1 deletion linker_scripts/us/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,4 +438,40 @@ D_300C340 = 0x300C340;
D_300C3C0 = 0x300C3C0;
D_300C440 = 0x300C440;
D_300C4C0 = 0x300C4C0;
D_83407AC8 = 0x83407AC8; // size:0x1A
D_83407AC8 = 0x83407AC8; // size:0x1A
D_3028E00 = 0x3028E00;
D_3029A80 = 0x3029A80;
D_302A700 = 0x302A700;
D_302B380 = 0x302B380;
D_2000C80 = 0x2000C80;
D_2000D80 = 0x2000D80;
D_2000E80 = 0x2000E80;
D_2000F80 = 0x2000F80;
D_2006C00 = 0x2006C00;
D_2007500 = 0x2007500;
D_20003C0 = 0x20003C0;
D_20005C0 = 0x20005C0;
D_20002C0 = 0x20002C0;
D_2000300 = 0x2000300;
D_2000340 = 0x2000340;
D_2000380 = 0x2000380;
D_3024C80 = 0x3024C80;
D_30260C0 = 0x30260C0;
D_2000B40 = 0x2000B40;
D_2000B80 = 0x2000B80;
D_2000BC0 = 0x2000BC0;
D_2000C00 = 0x2000C00;
D_302C000 = 0x302C000;
D_20287E0 = 0x20287E0;
D_2028860 = 0x2028860;
D_20288E0 = 0x20288E0;
D_2028960 = 0x2028960;
D_302FBC0 = 0x302FBC0;
D_30300C0 = 0x30300C0;
D_30242C0 = 0x30242C0;
D_30243A0 = 0x30243A0;
D_302EBC0 = 0x302EBC0;
D_82305A28 = 0x82305A28; // size:0x8
D_82305A50 = 0x82305A50; // size:0x1C
D_82305920 = 0x82305920; // size:0x50
D_82305978 = 0x82305978; // size:0x38
34 changes: 33 additions & 1 deletion linker_scripts/us/undefined_syms.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,36 @@ D_300BF00 = 0x300BF00;
D_300C340 = 0x300C340;
D_300C3C0 = 0x300C3C0;
D_300C440 = 0x300C440;
D_300C4C0 = 0x300C4C0;
D_300C4C0 = 0x300C4C0;
D_3028E00 = 0x3028E00;
D_3029A80 = 0x3029A80;
D_302A700 = 0x302A700;
D_302B380 = 0x302B380;
D_2000C80 = 0x2000C80;
D_2000D80 = 0x2000D80;
D_2000E80 = 0x2000E80;
D_2000F80 = 0x2000F80;
D_2006C00 = 0x2006C00;
D_2007500 = 0x2007500;
D_20003C0 = 0x20003C0;
D_20005C0 = 0x20005C0;
D_20002C0 = 0x20002C0;
D_2000300 = 0x2000300;
D_2000340 = 0x2000340;
D_2000380 = 0x2000380;
D_3024C80 = 0x3024C80;
D_30260C0 = 0x30260C0;
D_2000B40 = 0x2000B40;
D_2000B80 = 0x2000B80;
D_2000BC0 = 0x2000BC0;
D_2000C00 = 0x2000C00;
D_302C000 = 0x302C000;
D_20287E0 = 0x20287E0;
D_2028860 = 0x2028860;
D_20288E0 = 0x20288E0;
D_2028960 = 0x2028960;
D_302FBC0 = 0x302FBC0;
D_30300C0 = 0x30300C0;
D_30242C0 = 0x30242C0;
D_30243A0 = 0x30243A0;
D_302EBC0 = 0x302EBC0;
47 changes: 4 additions & 43 deletions src/22630.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,6 @@
#include "src/hal_libc.h"
#include "src/util.h"

typedef struct unk_D_800AC910_50 {
/* 0x000 */ char unk000[0x18];
/* 0x018 */ u8 unk_018[11];
/* 0x023 */ char unk023[0x62];
/* 0x085 */ u8 unk_085;
/* 0x086 */ char unk086[0x4];
/* 0x08A */ u8 unk_08A;
/* 0x08B */ char unk08B[0x3EC];
/* 0x477 */ s8 unk_477;
/* 0x478 */ char unk478[0xA5];
/* 0x51D */ s8 unk_51D;
/* 0x51E */ char unk51E[0x48E];
/* 0x9AC */ u8 unk_9AC;
/* 0x9AB */ char unk9AB[0x5F6];
/* 0xFA1 */ u8 unk_FA1;
/* 0xFA2 */ char unkFA2[0x1E];
} unk_D_800AC910_50; // size = 0xFC0

typedef struct unk_D_800AC910_40 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ char unk_02[11];
} unk_D_800AC910_40;

typedef struct unk_D_800AC910 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ u8 unk_02;
/* 0x03 */ u8 unk_03;
/* 0x04 */ u8 unk_04;
/* 0x05 */ u8 unk_05;
/* 0x06 */ char unk06[0x13];
/* 0x19 */ u8 unk_019[0x20];
/* 0x39 */ char unk39[0x7];
/* 0x40 */ u16 unk_40;
/* 0x42 */ char unk_42[11];
/* 0x4D */ u8 unk_4D[2];
/* 0x50 */ unk_D_800AC910_50* unk_50;
/* 0x54 */ void* unk_54;
} unk_D_800AC910; // size = 0x58

extern unk_D_80070F84 D_80070F84[];

extern unk_D_800AC910 D_800AC910[];
Expand Down Expand Up @@ -672,7 +633,7 @@ s32 func_800240A0(void) {
var_s0->unk_02 = 0;
var_s0->unk_05 = 0;

var_s0->unk_40 = 0x5000;
var_s0->unk_40.unk_00 = 0x5000;

for (j = 0; j < 11; j++) {
var_s0->unk_42[j] = '\x00';
Expand Down Expand Up @@ -772,9 +733,9 @@ s32 func_80024FB0(s32 arg0) {
return 0;
}

D_800AC910[arg0].unk_40 = func_80021A30(&D_800AC910[arg0].unk_50->unk_085);
_bcopy(&D_800AC910[arg0].unk_50->unk_018, &D_800AC910[arg0].unk_42, 0xB);
bzero(D_800AC910[arg0].unk_4D, 3);
D_800AC910[arg0].unk_40.unk_00 = func_80021A30(&D_800AC910[arg0].unk_50->unk_085);
_bcopy(&D_800AC910[arg0].unk_50->unk_018, &D_800AC910[arg0].unk_40.unk_02, 0xB);
bzero(D_800AC910[arg0].unk_40.unk_0D, 3);
return 1;
}

Expand Down
42 changes: 42 additions & 0 deletions src/22630.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,45 @@ typedef struct unk_func_8820BE14_sp {
/* 0x53 */ u8 unk_53;
} unk_func_8820BE14_sp; // size = 0x54

typedef struct unk_D_800AC910_50 {
/* 0x000 */ char unk000[0x18];
/* 0x018 */ u8 unk_018[11];
/* 0x023 */ char unk023[0x62];
/* 0x085 */ u8 unk_085;
/* 0x086 */ char unk086[0x4];
/* 0x08A */ u8 unk_08A;
/* 0x08B */ char unk08B[0x3EC];
/* 0x477 */ s8 unk_477;
/* 0x478 */ char unk478[0xA5];
/* 0x51D */ s8 unk_51D;
/* 0x51E */ char unk51E[0x48E];
/* 0x9AC */ u8 unk_9AC;
/* 0x9AB */ char unk9AB[0x5F6];
/* 0xFA1 */ u8 unk_FA1;
/* 0xFA2 */ char unkFA2[0x1E];
} unk_D_800AC910_50; // size = 0xFC0

typedef struct unk_D_800AC910_040 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ char unk_02[11];
/* 0x0D */ u8 unk_0D[2];
/* 0x0F */ char unkF[0x1];
} unk_D_800AC910_040; // size = 0x10

typedef struct unk_D_800AC910 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ u8 unk_02;
/* 0x03 */ u8 unk_03;
/* 0x04 */ u8 unk_04;
/* 0x05 */ u8 unk_05;
/* 0x06 */ char unk06[0x13];
/* 0x19 */ u8 unk_019[0x20];
/* 0x39 */ char unk39[0x7];
/* 0x40 */ unk_D_800AC910_040 unk_40;
/* 0x50 */ unk_D_800AC910_50* unk_50;
/* 0x54 */ void* unk_54;
} unk_D_800AC910; // size = 0x58

u16 func_80021A30(u8* arg0);
u32 func_80021A48(u8* arg0);
void func_80021A68(u8* arg0, s32 arg1);
Expand All @@ -119,6 +158,7 @@ u32 func_800224B8(s32 arg0, u16 arg1);
u16 func_800226C0(s32 arg0, u32 arg1);
void func_80022734(unk_func_8820BE14_sp*);
void func_800228B0(unk_func_8820BE14_sp*);
s16 func_80022A04(u16*, unk_D_800AC910_040*);
s8 func_80022A28(s32);
u8 func_80022A38(s32 arg0);
u8 func_80022A60(s32 arg0);
Expand Down Expand Up @@ -148,10 +188,12 @@ s32 func_800243D8(s32);
void func_8002447C(s32);
void func_800244F4(s32);
s32 func_80024A48(s32, s32, s32);
void func_80024CB0(s32, s32, s32, s32, unk_func_80026268_arg0*);
s32 func_80024EF4(void);
s32 func_80024F00(s32);
u8 func_80024F68(s32);
s32 func_80024FB0(s32 arg0);
void func_80025040(s16, unk_D_800AC910_040*);
s32 func_80025084(s32);
s32 func_8002513C(s32);
char* func_800251B0(s32, char*);
Expand Down
4 changes: 2 additions & 2 deletions src/F420.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Vec3s D_8006F05C = { 0, 0, 0 };
Vec3f D_8006F064 = { 1.0f, 1.0f, 1.0f };
u16 D_8006F070[] = { 1, 1, 1 };

Color_RGBA8_u32* func_8000E820(Color_RGBA8_u32* arg0, u8 r, u8 g, u8 b) {
Color_RGBA8* func_8000E820(Color_RGBA8* arg0, u8 r, u8 g, u8 b) {
arg0->r = r;
arg0->g = g;
arg0->b = b;

return arg0;
}

Color_RGBA8_u32* func_8000E840(Color_RGBA8_u32* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) {
Color_RGBA8* func_8000E840(Color_RGBA8* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4) {
arg0->r = arg1;
arg0->g = arg2;
arg0->b = arg3;
Expand Down
4 changes: 2 additions & 2 deletions src/F420.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ extern Vec3s D_8006F05C;
extern Vec3f D_8006F064;
extern u16 D_8006F070[];

Color_RGBA8_u32* func_8000E820(Color_RGBA8_u32* arg0, u8 r, u8 g, u8 b);
Color_RGBA8_u32* func_8000E840(Color_RGBA8_u32* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4);
Color_RGBA8* func_8000E820(Color_RGBA8* arg0, u8 r, u8 g, u8 b);
Color_RGBA8* func_8000E840(Color_RGBA8* arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4);
Vec3f* func_8000E868(Vec3f* arg0, f32 arg1, f32 arg2, f32 arg3);
Vec3f* func_8000E88C(Vec3f* arg0, f32 arg1, f32 arg2, f32 arg3);
Vec3f* func_8000E8B0(Vec3f* arg0, Vec3f* arg1);
Expand Down
Loading