Skip to content

Commit 3739c85

Browse files
RevoSucksRevoSucks
authored
Merge pull request #166 from Kelebek1/fragment26
fragment26
2 parents 56376c4 + d48940e commit 3739c85

15 files changed

+3692
-569
lines changed

‎include/variables.h

+41
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,47 @@ extern u8 D_4001010[];
121121
extern u8 D_4001C90[];
122122
extern u8 D_4001FB8[];
123123
extern u8 D_4006AB8[];
124+
extern u8 D_4007750[];
125+
extern u8 D_4007798[];
126+
extern u8 D_40077E0[];
127+
extern u8 D_4007828[];
128+
extern u8 D_4006F40[];
129+
extern u8 D_4006F88[];
130+
extern u8 D_4006FD0[];
131+
extern u8 D_4007018[];
132+
extern u8 D_4007060[];
133+
extern u8 D_40070A8[];
134+
extern u8 D_40070F0[];
135+
extern u8 D_4007138[];
136+
extern u8 D_4007180[];
137+
extern u8 D_40071C8[];
138+
extern u8 D_4007BF0[];
139+
extern u8 D_4007210[];
140+
extern u8 D_4007318[];
141+
extern u8 D_4007420[];
142+
extern u8 D_4007528[];
143+
extern u8 D_4001218[];
144+
extern u8 D_4001320[];
145+
extern u8 D_4001428[];
146+
extern u8 D_4001530[];
147+
extern u8 D_4007630[];
148+
extern u8 D_4007678[];
149+
extern u8 D_40076C0[];
150+
extern u8 D_4007708[];
151+
extern u8 D_4007948[];
152+
extern u8 D_4007978[];
153+
extern u8 D_04005C48[];
154+
extern u8 D_04005F70[];
155+
extern u8 D_04006298[];
156+
extern u8 D_040065C0[];
157+
extern u8 D_40068E8[];
158+
extern u8 D_4006930[];
159+
extern u8 D_4006978[];
160+
extern u8 D_40069C0[];
161+
extern u8 D_4007AD0[];
162+
extern u8 D_4007B18[];
163+
extern u8 D_4007B60[];
164+
extern u8 D_4007BA8[];
124165

125166
extern u8 D_800818E0[0x20];
126167

‎linker_scripts/us/symbol_addrs.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -381,4 +381,8 @@ D_88217C48 = 0x88217C48; // size:0x4
381381
D_88217C4C = 0x88217C4C; // size:0x4
382382
D_88217C50 = 0x88217C50; // size:0x4
383383
D_88217C54 = 0x88217C54; // size:0x4
384-
D_88217C58 = 0x88217C58; // size:0x4
384+
D_88217C58 = 0x88217C58; // size:0x4
385+
D_04005C48 = 0x04005C48;
386+
D_04005F70 = 0x04005F70;
387+
D_04006298 = 0x04006298;
388+
D_040065C0 = 0x040065C0;

‎linker_scripts/us/undefined_syms.ld

+4
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ D_03045E20 = 0x03045E20;
3030
D_03049020 = 0x03049020;
3131
D_030483A0 = 0x030483A0;
3232
D_03047720 = 0x03047720;
33+
D_04005C48 = 0x04005C48;
34+
D_04005F70 = 0x04005F70;
35+
D_04006298 = 0x04006298;
36+
D_040065C0 = 0x040065C0;

‎src/fragments/23/fragment23.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ typedef struct unk_func_8820B12C_000 {
131131
/* 0x04 */ struct unk_func_8820B12C_000* unk_04;
132132
/* 0x08 */ struct unk_func_8820B12C_000* unk_08;
133133
/* 0x0C */ char unk0C[0x4];
134-
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
135-
/* 0x14 */ unk_func_88203ED8_064_014 unk_14;
134+
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
135+
/* 0x14 */ unk_func_8820B12C_02C_014 unk_14;
136136
/* 0x18 */ char unk18[0x4];
137137
/* 0x1C */ s32 unk_1C;
138138
/* 0x20 */ s32 unk_20;
@@ -316,8 +316,8 @@ typedef struct unk_func_8821421C_02C_06C_000 {
316316
/* 0x04 */ struct unk_func_88203ED8_064* unk_04;
317317
/* 0x08 */ struct unk_func_88203ED8_064* unk_08;
318318
/* 0x0C */ char unk0C[0x4];
319-
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
320-
/* 0x14 */ unk_func_88203ED8_064_014 unk_14;
319+
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
320+
/* 0x14 */ unk_func_8820B12C_02C_014 unk_14;
321321
/* 0x18 */ char unk18[0x4];
322322
/* 0x1C */ s32 unk_1C;
323323
/* 0x20 */ s32 unk_20;
@@ -371,7 +371,7 @@ typedef struct unk_func_8821421C_038_04C_000 {
371371
/* 0x04 */ struct unk_func_88203ED8_064* unk_04;
372372
/* 0x08 */ struct unk_func_88203ED8_064* unk_08;
373373
/* 0x0C */ char unk0C[0x4];
374-
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
374+
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
375375
/* 0x14 */ unk_func_8821421C_038_04C_000_014 unk_14;
376376
/* 0x18 */ char unk18[0x4];
377377
/* 0x1C */ s32 unk_1C;
@@ -461,7 +461,7 @@ extern u32* D_88223470[];
461461
extern u32 D_88223488[];
462462
extern u32 D_88223E48[];
463463

464-
s32 func_88200020(void);
464+
unk_D_800AC870* func_88200020(void);
465465
void func_882000E4(void);
466466
s32 func_88200110(UNUSED s32 arg0, UNUSED s32 arg1);
467467
s32 func_88200190(s32 arg0, s32 arg1);
@@ -592,7 +592,7 @@ s32 func_8820B838(unk_func_8820B12C* arg0, Controller* arg1);
592592
void func_8820C510(unk_func_8820BE14* arg0);
593593
void func_8820C5BC(unk_func_8820BE14* arg0);
594594
void func_8820C63C(unk_func_8820BE14* arg0);
595-
void func_8820C700(s32 arg0, s32 arg1);
595+
void func_8820C700(unk_D_800AC870* arg0, s32 arg1);
596596

597597
void func_8820C930(s32 arg0, s32 arg1, s32 arg2, unk_func_8820BE14_06C* arg3);
598598
void func_8820C97C(s32 arg0, s32 arg1, s32 arg2, unk_func_8820BE14_06C* arg3, s32 arg4, char* arg5, s32 arg6);
@@ -686,7 +686,7 @@ s32 func_88213CA0(unk_func_8821421C_02C_06C* arg0, Controller* arg1);
686686
void func_8821421C(unk_func_8821421C* arg0, s32 arg1, s32 arg2, MemoryPool* arg3, s32 arg4, char** arg5);
687687
void func_88214720(unk_func_8821421C* arg0);
688688
void func_882147BC(unk_func_8821421C* arg0);
689-
void func_8821483C(s32 arg0);
689+
void func_8821483C(unk_D_800AC870* arg0);
690690

691691
void func_882149A0(unk_func_882149A0* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, Color_RGBA8 arg7, Color_RGBA8 arg8, Color_RGBA8 arg9);
692692
s32 func_88214A58(unk_func_882149A0* arg0, s32 arg1, s32 arg2);

‎src/fragments/23/fragment23_1A8590.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "src/memory.h"
66
#include "src/stage_loader.h"
77

8-
s32 func_88200020(void) {
8+
unk_D_800AC870* func_88200020(void) {
99
unk_D_800AC870* sp1C;
1010

1111
main_pool_push_state('TERM');
@@ -37,7 +37,7 @@ s32 func_88200110(UNUSED s32 arg0, UNUSED s32 arg1) {
3737
}
3838

3939
s32 func_88200190(s32 arg0, s32 arg1) {
40-
s32 temp_s0;
40+
unk_D_800AC870* temp_s0;
4141
s32 var_s1;
4242

4343
if (arg0 == 5) {

0 commit comments

Comments
 (0)