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

fragment33 #172

Merged
merged 1 commit into from
Mar 11, 2025
Merged

fragment33 #172

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
7 changes: 7 additions & 0 deletions include/sections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ extern u8 fragment33_ROM_START[];
extern u8 fragment33_ROM_END[];
extern u8 fragment33_relocs_ROM_END[];
extern u8 fragment33_misc_ROM_START[];
extern u8 fragment33_misc_ROM_END[];

// fragment 34
extern u8 fragment34_TEXT_START[];
Expand Down Expand Up @@ -548,6 +549,12 @@ extern u8 _6A9750_ROM_START[];
extern u8 _6A9750_ROM_END[];
extern u8 copyright_ROM_START[];
extern u8 copyright_ROM_END[];
extern u8 _6EC4D0_ROM_START[];
extern u8 _6EC4D0_ROM_END[];
extern u8 trade_select_ui_ROM_START[];
extern u8 trade_select_ui_ROM_END[];



extern u8 D_124570[];

Expand Down
25 changes: 25 additions & 0 deletions include/variables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ extern f32 gCosineTable[0x1000];
extern s16 gArctanTable[0x401];

extern u8 D_1000000[];
extern u8 D_8000000[];
extern u8 D_81000000[];
extern u8 D_1001800[];
extern Gfx D_1002480[];
extern Gfx D_1002508[];
extern Gfx D_1002590[];
extern u8 D_2000000[];
extern u8 D_3000000[];
extern u8 D_3000000_2[];
extern u8 D_04000000[];
extern u8 D_4000008[];
extern u8 D_4000810[];
Expand Down Expand Up @@ -244,6 +247,28 @@ extern u8 D_30300C0[];
extern u8 D_30242C0[];
extern u8 D_30243A0[];
extern u8 D_302EBC0[];
extern u8 D_201D820[];
extern u8 D_201DB20[];
extern u8 D_201DE20[];
extern u8 D_201E120[];
extern u8 D_201E420[];
extern u8 D_2020420[];
extern u8 D_2022420[];
extern u8 D_2024420[];
extern u8 D_3006668[];
extern u8 D_3000008[];
extern u8 D_3004EF0[];
extern u8 D_30055B0[];
extern u8 D_3005A18[];
extern u8 D_03000FD0[];
extern u8 D_03001F98[];
extern u8 D_03002F60[];
extern u8 D_03003F28[];
extern u8 D_3006060[];
extern u8 D_3008670[];
extern u8 D_3009678[];
extern u8 D_3012D80[];
extern u8 D_301C488[];

extern u8 D_800818E0[0x20];

Expand Down
22 changes: 21 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 @@ -474,4 +474,24 @@ D_302EBC0 = 0x302EBC0;
D_82305A28 = 0x82305A28; // size:0x8
D_82305A50 = 0x82305A50; // size:0x1C
D_82305920 = 0x82305920; // size:0x50
D_82305978 = 0x82305978; // size:0x38
D_82305978 = 0x82305978; // size:0x38
D_201D820 = 0x201D820;
D_201DB20 = 0x201DB20;
D_201DE20 = 0x201DE20;
D_201E120 = 0x201E120;
D_201E420 = 0x201E420;
D_2020420 = 0x2020420;
D_2022420 = 0x2022420;
D_2024420 = 0x2024420;
D_3006668 = 0x3006668;
D_81303FA8 = 0x81303FA8; // size:0x58
D_3000008 = 0x3000008;
D_3004EF0 = 0x3004EF0;
D_30055B0 = 0x30055B0;
D_3005A18 = 0x3005A18;
D_03000FD0 = 0x03000FD0;
D_03001F98 = 0x03001F98;
D_03002F60 = 0x03002F60;
D_03003F28 = 0x03003F28;
D_3006060 = 0x3006060;
D_3000000 = 0x3000000;
6 changes: 6 additions & 0 deletions linker_scripts/us/undefined_syms.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,9 @@ D_30300C0 = 0x30300C0;
D_30242C0 = 0x30242C0;
D_30243A0 = 0x30243A0;
D_302EBC0 = 0x302EBC0;
D_03000FD0 = 0x03000FD0;
D_03001F98 = 0x03001F98;
D_03002F60 = 0x03002F60;
D_03003F28 = 0x03003F28;
D_3000000 = 0x3000000;
D_3000000_2 = 0x3000000;
5 changes: 3 additions & 2 deletions src/22630.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,10 @@ 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);
u32 func_80024F68(s32);
char func_80024F8C(s32);
s32 func_80024FB0(s32 arg0);
void func_80025040(s16, unk_D_800AC910_040*);
void func_80025040(s32, unk_D_800AC910_040*);
s32 func_80025084(s32);
s32 func_8002513C(s32);
char* func_800251B0(s32, char*);
Expand Down
Loading