Skip to content

Commit 2c556db

Browse files
committed
fragment33
1 parent 3368f29 commit 2c556db

File tree

8 files changed

+1088
-7
lines changed

8 files changed

+1088
-7
lines changed

include/sections.h

+7
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ extern u8 fragment33_ROM_START[];
207207
extern u8 fragment33_ROM_END[];
208208
extern u8 fragment33_relocs_ROM_END[];
209209
extern u8 fragment33_misc_ROM_START[];
210+
extern u8 fragment33_misc_ROM_END[];
210211

211212
// fragment 34
212213
extern u8 fragment34_TEXT_START[];
@@ -548,6 +549,12 @@ extern u8 _6A9750_ROM_START[];
548549
extern u8 _6A9750_ROM_END[];
549550
extern u8 copyright_ROM_START[];
550551
extern u8 copyright_ROM_END[];
552+
extern u8 _6EC4D0_ROM_START[];
553+
extern u8 _6EC4D0_ROM_END[];
554+
extern u8 trade_select_ui_ROM_START[];
555+
extern u8 trade_select_ui_ROM_END[];
556+
557+
551558

552559
extern u8 D_124570[];
553560

include/variables.h

+25
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,15 @@ extern f32 gCosineTable[0x1000];
5656
extern s16 gArctanTable[0x401];
5757

5858
extern u8 D_1000000[];
59+
extern u8 D_8000000[];
60+
extern u8 D_81000000[];
5961
extern u8 D_1001800[];
6062
extern Gfx D_1002480[];
6163
extern Gfx D_1002508[];
6264
extern Gfx D_1002590[];
6365
extern u8 D_2000000[];
6466
extern u8 D_3000000[];
67+
extern u8 D_3000000_2[];
6568
extern u8 D_04000000[];
6669
extern u8 D_4000008[];
6770
extern u8 D_4000810[];
@@ -244,6 +247,28 @@ extern u8 D_30300C0[];
244247
extern u8 D_30242C0[];
245248
extern u8 D_30243A0[];
246249
extern u8 D_302EBC0[];
250+
extern u8 D_201D820[];
251+
extern u8 D_201DB20[];
252+
extern u8 D_201DE20[];
253+
extern u8 D_201E120[];
254+
extern u8 D_201E420[];
255+
extern u8 D_2020420[];
256+
extern u8 D_2022420[];
257+
extern u8 D_2024420[];
258+
extern u8 D_3006668[];
259+
extern u8 D_3000008[];
260+
extern u8 D_3004EF0[];
261+
extern u8 D_30055B0[];
262+
extern u8 D_3005A18[];
263+
extern u8 D_03000FD0[];
264+
extern u8 D_03001F98[];
265+
extern u8 D_03002F60[];
266+
extern u8 D_03003F28[];
267+
extern u8 D_3006060[];
268+
extern u8 D_3008670[];
269+
extern u8 D_3009678[];
270+
extern u8 D_3012D80[];
271+
extern u8 D_301C488[];
247272

248273
extern u8 D_800818E0[0x20];
249274

linker_scripts/us/symbol_addrs.txt

+21-1
Original file line numberDiff line numberDiff line change
@@ -474,4 +474,24 @@ D_302EBC0 = 0x302EBC0;
474474
D_82305A28 = 0x82305A28; // size:0x8
475475
D_82305A50 = 0x82305A50; // size:0x1C
476476
D_82305920 = 0x82305920; // size:0x50
477-
D_82305978 = 0x82305978; // size:0x38
477+
D_82305978 = 0x82305978; // size:0x38
478+
D_201D820 = 0x201D820;
479+
D_201DB20 = 0x201DB20;
480+
D_201DE20 = 0x201DE20;
481+
D_201E120 = 0x201E120;
482+
D_201E420 = 0x201E420;
483+
D_2020420 = 0x2020420;
484+
D_2022420 = 0x2022420;
485+
D_2024420 = 0x2024420;
486+
D_3006668 = 0x3006668;
487+
D_81303FA8 = 0x81303FA8; // size:0x58
488+
D_3000008 = 0x3000008;
489+
D_3004EF0 = 0x3004EF0;
490+
D_30055B0 = 0x30055B0;
491+
D_3005A18 = 0x3005A18;
492+
D_03000FD0 = 0x03000FD0;
493+
D_03001F98 = 0x03001F98;
494+
D_03002F60 = 0x03002F60;
495+
D_03003F28 = 0x03003F28;
496+
D_3006060 = 0x3006060;
497+
D_3000000 = 0x3000000;

linker_scripts/us/undefined_syms.ld

+6
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,9 @@ D_30300C0 = 0x30300C0;
116116
D_30242C0 = 0x30242C0;
117117
D_30243A0 = 0x30243A0;
118118
D_302EBC0 = 0x302EBC0;
119+
D_03000FD0 = 0x03000FD0;
120+
D_03001F98 = 0x03001F98;
121+
D_03002F60 = 0x03002F60;
122+
D_03003F28 = 0x03003F28;
123+
D_3000000 = 0x3000000;
124+
D_3000000_2 = 0x3000000;

src/22630.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,10 @@ s32 func_80024A48(s32, s32, s32);
191191
void func_80024CB0(s32, s32, s32, s32, unk_func_80026268_arg0*);
192192
s32 func_80024EF4(void);
193193
s32 func_80024F00(s32);
194-
u8 func_80024F68(s32);
194+
u32 func_80024F68(s32);
195+
char func_80024F8C(s32);
195196
s32 func_80024FB0(s32 arg0);
196-
void func_80025040(s16, unk_D_800AC910_040*);
197+
void func_80025040(s32, unk_D_800AC910_040*);
197198
s32 func_80025084(s32);
198199
s32 func_8002513C(s32);
199200
char* func_800251B0(s32, char*);

0 commit comments

Comments
 (0)